vendored fog fixes