GSW: very minor tweaks.