More tstee fixes.