Minor tweaks to Crave 4/17