Fix supervisor and maintenance