supervisor fixes