Fixes to lambdaP