Pushing these improvements to 1.0.0-Beta1, as it seems both would need some changes in Keycloak/integration.