Fixes for Keycloak redirect issues