Fix some wellformedness issues

Also fixed some duplicate IDs reported by Mats Erik Andersson.

Created by  Eelco Dolstra  on September 3, 2013
2G63HKCHG7S6DGWDOHSDF7PXFPD6H4TRKDKIIFCXXAKET6FCWN2AC
Dependencies
In channels
main
upstream
Change contents