Tweak command-line handling