Fix bugs in Eloquent.