Further fixes to make nonlinear PPP work ...