Fix super ctor issues