* Fix build problems on Mac/Darwin (merged 5 commits thias42:master)