Fix bugs. Removing $this in a static context.