Fixed spring dependency issues