WP and plug-in upgrades

@loicsans -- if you could review these upgrades please and kindly approve the pull request if agreeable.