more tck fixes