Upgrade to work with snap 0.12