Some improvements to VBAP