rethinkdb fixes