More compiling fixes.