Fixing bugs and limitations with Vineyard.