Bulk fixes