More BC tweaks