Tweaks for Linux build