Commands bug fixes
Commands bug fixes