Spring 4 fixes