Patch for df-core bugs.