Spring stuff improvements