Minor fix and upgrade of Typescript