Add super calls that should have been there