Changed some of the calls to functions and properties from self:: to .