more typescript conversions