Frozen collection support and fixes