supervisor's fixes