Fix compilation issues after spring public API changes.