Align to Forge 1121 and other random cleanups and tweaks