Fix for isExipred method in OAuth2Token.
Other minor changes.