Fixed TypeScript stuff