Improvements to command line parsing

This is due to the updated command line parsing routine.