t571 - minor tweaks