Modify stuff to make it work on Linux...

Title says it all...

@voisardf, could you review and test that (on a Windows instance...)