Fixes on manager