command_manager fixes