Fix AccessToken handling :-P