addtional_storage fixes