Fixed issues with compiling