Upstream: Fixes.