Minor fixes for usage errors.
Merge pull request #647 from camfitz/dev

Minor fixes for usage errors.