Improve cmd checks.