Compiling fixes