Add locations to more upstream bugs