Various updates to improve renderings with finnicky scans