Manager bugfixes