Minor TK changes