CMD check fixes