Fix commandconvert bugs... at least try to