More OAuth2 SPOP related updates