Oracle Solaris fixes
Merge pull request #1329 from markbenvenuto/solaris_fix

Oracle Solaris fixes