Compile tweaks