More fixes for comparison rendering