Make some tweaks for "spring mode"