Issue #114 State transition to MAINTENANCE fixes