Added Solaris OS fixes