Fixed some more CommandManager additions

Yay for not testing things.
Don't do that at home, kids!