Minor bug fix and improved sitemap.xml handling.