Manual mods to bring inline with master