More $this fixes.