err, are those upstream bugs?