Fixing bugs for Solaris