BRC tweaks and fix