Minor improvements in manager