Update to latest changes from compat.
Update for solaris.