Couple of makeFD/normFD things added, not yet tested