Fixed issue where command line options where overwritten by environment
variables.