More build updates for Linux
Yet more build updates