Fix some fd vs. exec issues