Properly fix auto-<br> issues