Fixed corner case bugs in 2-entry store buffer
Had to special-case barrier and store collision properly