Minor GS changes