Hack in Solaris support