a few fixes in the TS