Post-maintenance update

Further amendments to the post-maintenance routine.