Some random changes for OAuth workflows