Compiler tweaks...