Updates to make BM4 act more like BM3