more tcl fixes