Patches to remove Data Tables error.