Mongo storage fixes