Minor tweaks
tst