RavenDB_1610 + minor fixes