Stash tweaks