Fix a couple things with suped-up gpp