Fix typescript after upgrade