WIP: GS input size fixes