Multiple bug fixes for 2x2 prod. #192

Closed francois-drielsma closed 5 months ago