Fixed some runtime pattern matching issues due to project being out of sync with oauth2