fixing TypeScript errors