benchmark fixes and more sensible enumeration for dynamic objects