Grape tweaks