Improve support for Solaris and variants