Fixes to gplus access token related errors