Few more GS specific tweaks.