OAuth token and other tweaks