More FD integration improvements...