Various XSLT fixes.
Release 2.3.2