Some fixups
Clear up on logout