Grape fixes