Add missing calls to super