fixes for storage