More feedforward fixes.