Fixing compiling issues