Linux build fixes #919
Merge pull request #921 from lodle/linuxfixes

Linux build fixes #919