Filestorage fixes