Minor optimizations in manager