added fixes to composition Xml

fixes for issues #20 and #21