Contact/XML Fixes