Fixes in cmd1.cpp