Fix the SysInfo/Solaris code