RavenDB-2708 Small fixes