HTML and warning fixes.