Tweaked command line options