Minor command line tweaks