add upstream workarounds