More oauth fixes