Fix eager loading and mapping regressions