Fixes for logged out users