Bug fixes to connections in xml correction