Fixing some Spring issue