Fixing issues that arose with Eloquent changes.

Signed-off-by: Ben Corlett <bencorlett@me.com>