CMS-4070 Improve handling of value types in Typescript
Fixed compilation problems