Fixed some Spring issues