Bring in latest Solaris fixes from jeffe