Fix up overrides

Screwed up by not calling a method and added in some more manual
overrides.