Addressed bug 2193. Minor xml changes.