Fix xsl_flags and xsl_base