Various changes required by the SSO on the Extension