More Linux fixes