Trunk fixes for Linux build