Add references to upstream issues for workarounds