Compiling issues fixed