nfd: Package fixes