Tweaks to have executable separate from arguments