XSLT fixes