Adding more overrides to attempt to fix variants across OSes