Hello,

Here are some fixes for non-linux build.

Samuel