Fixes cli and private_xml

Fixes #2