More maint mode refinement