Fixes for XSLT warnings.