Fixed some more xml misconfigurations and bugs.