Fixes to dojo rules