Fixes to CommandImage