fixes for cmds