TCK changes and fixes