Fixed cmdmgr

same here and for all the following