Fixed some eager loading issues