Bug fixes for P() params