Fix in maintenenace-mode-methods and config