More fixes for GP