Smallish fixes for argparser