Fix setup/teardown of supervisors