tck and oauth2 fixes