Update to build against latest heroes