spring 3.2 additional fixes