Fixed compiling issues with some compilers