LocalSample spring context fixes