Small fixes for custom tss file and output format