Minor tweaks to support latest RethinkDB