mongodb storage fixes