Update forced workarounds