More fixes to the usage.