Fix session issues