Fixing command line args a bit.