Minor changes to Compile phase