Fixes on usage output