Fix a lot vineyard delimeter bugs