Fix dangling pointers in sitemap