Post-maintenance update

Some fixes to our post-maintenance system.