CBV index fixes