Fixed delimiter in many places