Fixed spring9 issues