Bug fixes for GP.