Some tweaks to get command