Updates needed to work with Graphene Beta1

The pull request is NOT READY to be merged. It just tracks needed updates.