BM1: minor tweaks