diff --git a/format-master.xml b/format-master.xml
index 28ca112..fff1c68 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -231,6 +231,21 @@
 		<html><xsl:text disable-output-escaping="yes">&amp;#8835;</xsl:text></html>
 	</template>
 
+	<template name="join-operator" match="join-operator|join|natural-join">
+		<latex>\ensuremath{\Join}</latex>
+		<html><xsl:text disable-output-escaping="yes">|&amp;#215;|</xsl:text></html>
+	</template>
+
+	<template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
+		<latex>\ensuremath{\cap}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8745;</xsl:text></html>
+	</template>
+
+	<template name="union-operator" match="union-operator|union|cup">
+		<latex>\ensuremath{\cup}</latex>
+		<html><xsl:text disable-output-escaping="yes">&amp;#8746;</xsl:text></html>
+	</template>
+
 	<template name="LaTeX" match="LaTeX|latex">
 		<latex>{\LaTeX}</latex>
 		<html>L<SUP>A</SUP>T<SUB>E</SUB>X</html>
@@ -1918,7 +1933,7 @@
 	
 	<template name="times-operator" match="times">
 		<latex>\ensuremath{\times}</latex>
-		<html><xsl:text disable-output-escaping="yes"> &amp;#215; </xsl:text></html>
+		<html><xsl:text disable-output-escaping="yes">&amp;#215;</xsl:text></html>
 	</template>
 	
 	<template name="divide-operator" match="divide">
@@ -1927,7 +1942,7 @@
 	
 	<template name="equals-operator" match="equals">
 		<!-- Need spaces for HTML as they seem to get munched otherwise. -->
-		<common> = </common>
+		<common>=</common>
 	</template>
 
 	<template name="greater-than-operator" match="greater-than|gt">
