Logout fixes