Couple tweaks, Stable before authentication