Added better SunOS support.