fixes for FileStore