Minor changes designed to make debugging oauth issues easier. Uses
uncommitted oauth changes.