Fix eager load issues