More Linux fixes.