More fixes to XML and Input