Sneaking in some maintenance area fixes