Linux build fixes. See #4880