More Linux build error fixes.