RavenDB 1224 and 1225

Minor code fixes