Fix a few errors with new supervisor