committed last public fixes to t5