Fix some issues in Eloquent.
Merge branch 'eloquent-touch'