Bug fixes for command-line options that weren't getting used properly