A few more changes for proper data harvesting