Add and fix GPAs