Update for solaris support.