Cleaned up and expanded to support solaris builCleaned up and expanded to support solaris build