Fix minor issues in XSL transformations, refs #444, #387