Fixups for Solaris port.