Fixed some onCommand validation errors