fix type errors when testing after upgrade