Updated everything to work with Heist 0.13