Re: Fixed some ref handling