Make VP more BP compatible