Additional usage fixes

These should be the last