Session stuffs hotfixes