More minor UNIX fixes
Merge pull request #16 from hannesmuehleisen/master

More minor UNIX fixes