Fix a few usage exceptions