Fixes for Linux build