Some compiling fixes