Typescript version update fixes