More spring changes