First round of spring fixes. Some dependencies still needs to be fixed.