Fix issues with XMLParser and CustomTypes classes