Tweaks to cellar