Add more overrides, vendor prefixes