Minor changes to manager.py