Fixing more late-night cock ups