Minor Confic Changes