Minor adjustments to arg parsing