fixes related to managers