Compilation adjustments