Add some errata workarounds