fixes to work with Dexterity