Added Solaris OS fixes. Ticket #396