Fixes for KEYCLOAK-736