Some fixes for GP