more bug fixes in F::d