Changes for new core.typed version