fix some issues with bulk run