Compiler fixes (still not building correctly.