Ppod fixes

Open for review.

<!---
@huboard:{"order":10.5,"custom_state":""}
-->