fix issues that arose in Ecto.RiakModel.Queryable with ecto master