Minor mods to control code