Side-by-side comparison fixes