Spring COnfig fixes