GridFS related fixes