Fix: various (including discard unmanaged attributes from storage)