Fix some spring refactor