Ppod fixes

Open for review.