minor improvements on session handling in 1.4