Tweaked command-line arguments