Upgrade to work with heist 0.13