Upstream, CAF, and other small fixes.