Further fixes to code for when no commandline options are specified.