bulk fixes
bulk fixes