Added more checks for Solaris