supervisor bugfixes