fixes for Linux build