Fix session issues for 1.7