Tweaks to komodo command