Incorporate Dr. Ripley's fixes for Solaris