Some more logout related changes.