More BC fixes