Fixes for CMD check