Merge pull request #919 from baryonix/solaris-misc-fixes