Fixing up oauth