Misc changes from our hangout