Fixes to usage restrictions