bitflip local fixes
merge