some spring fixes