Minor mods to compilation