More rendering correctness adjustments