more this / ref error fixes