- Compiler fixes