Fixes for Storage6 and Storage7