TS-2657
fix warnings
fix warnings