Keycloak related fixes