BVT Fixes