Fixes for Linux project