fastbulk - Adjustments to fix various issues