Fixes for spring-projects/spring-session#56