Reapply markup tweaks