Small bug fixes to make2RCMSxml & resulting files