CFG: Fixed some warnings and errors in Clang