Added some missing super calls.