Minor changes to command manager.