Fixing options passed to to_xml