Fixes to new Spring support.
Ignore this for now as it is unstable on Windows.