Fixes related to refresh_token support and related changes.