Massive VPL buf fix/cleanup