analysis worker and storage fixes