Minor fixes to T4 sample