More fixes for Solaris.