Refinements of the maintenance mode design spec