Fix super calls