Fix all sorts of rendering kerfuffle.