Fixes for tstee