spring context fixes