Fixed bugs caused by adding license headers to xml and also some import
bugs that crept into the controllers.