RavenDB-2268 More fixes