More usage message fixes
4 files changed