checkpoint
Fixes for compatibility with typescript 9.1.1
Additional fixes for ts 9.1.1