Merge refleak fixes from 3.2