Mer session/cookie fix