Small edits after the big bulk update change