TSV output support and some other tweaks