tsj: miscellaneous adjustements