Fix bugs in Spring 3.2/Jackson 2.4 update.