Attempting to add Solaris support