More Linux compatibility fixes.