BCH: - minor tweaks