* Compiler fixes