Fix problems from merge. Hopefully no styling is overridden.