Fix eager loading related issues.