Fix session token persistence issues