Added CommandType to a couple of methods where it was missing