Upgrade to plumbing 0.3.3