Some cleanup for pandoc