Use super() where appropriate

super() should be used when calling from subclass.