Adjust to Heaven changes
Merge pull request #1 from macgitver/topic/uncrappify1

Adjust to Heaven changes