bulk fixes