TMP: more fixes