fixes to comply with dexterity 2.0 release