CHG: Solaris support