Fixed spring bugs