Fix missing super calls