Merge pull request #29 from Metaswitch/plw

Merge of more plw fixes