* Minor fixes for supporting Spring 3.1