More Solaris build fixes from Steve Christensen <steve AT