More fixes for Solaris