various persistent file store bug fixes