Fixed some more gcc/clang compilation errors