History rendering fixes