tweaks for ST3 upgrade