Fixing Plloi's bugs.

[permalink]