Solved compiling issues