Fixing minor usage issues