More gp tweaks.