Fixed Typescript compilation