Upgrade to latest piston-current