fix: more typescript performance improvements