Upgrade to snapshot 0.6.2