Fix a couple bugs with using command args