[*] Final tweaks for Harvest integration