Further minor tweaks to STBAR2 and STARMS2