Fixed compiling issues