Fixing XSLT issues