[IMP-dev] Turning on more refcounting