Fix some issues with module.xml files