+ fixes to maintenance Mode