GSW: more little tweaks.