Upgraded Spring dependency from 3.2.9->4.0.5, removed compile-time errors