Got rid of some ref-types. Fixes in RC system.