Fixup for new version of oauth branch