Fix session storage variables