Updates to base

Upstream updates.