Custom BC fixes