fix 2 xhtml bugs
Merge pull request #1440 from RickSaling/join

fix 2 xhtml bugs