Some fixes for the command line spec