Three commits, mostly about Solaris support