Fix some ref count issues