Fixes after upgrade of TypeScript.