Slight fixes to eager loading where removal.