Forgot some supers in overridden methods.