CMD fixes