BVT fixes