Fix $this/self:: errors