Fix Compile errors from clang in FIB2.0 code