Fix stable compile for last Fall patch. Add control mods