fixes for clear storage