Fixes for dev.cmd