Bug fixes for maintenance container