some tweaks for BC