Bring in two updates from FreeBSD.