picture storage fixes