Solaris portability tweaks.