diff --git a/format-master.xml b/format-master.xml
index 73ee1ea..8cfd123 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -231,7 +231,14 @@
 
 	<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>
+		<!--
+			No easy way at present to get the join symbol in HTML, so
+			just use an image. Scale it to 10x10 pixels (fine as long as
+			font size is set relatively normally).
+		-->
+		<html>
+			<IMG SRC="../../Handbook/Graphics/join-operator-96dpi.png" ALT="Join operator" WIDTH="10" HEIGHT="10" STYLE="padding-left:0.3em;padding-right:0.3em"/>
+		</html>
 	</template>
 
 	<template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
@@ -548,7 +555,7 @@
 					should be treated like paragraphs inside the item. If so,
 					let them worry about inserting the <P> tags.
 				-->
-				<xsl:when test="count(paragraph|para|p|question|answer) != 0">
+				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
 					<LI><xsl:apply-templates/></LI>
 				</xsl:when>
 				<!--
@@ -663,7 +670,7 @@
 					Check whether there are actual paragraphs inside the question.
 					If so, let them worry about inserting the <P> tags.
 				-->
-				<xsl:when test="count(paragraph|para|p|question|answer) != 0">
+				<xsl:when test="count(paragraph|para|p|question|answer|code-block) != 0">
 					<xsl:apply-templates/>
 				</xsl:when>
 				<!--
@@ -1723,7 +1730,7 @@
 	<template match="image[count(provide-large-version) = 0]">
 		<latex><xsl:apply-templates select="." mode="latex"/></latex>
 		<html>
-			<IMG BORDER="0">
+			<IMG CLASS="padded" BORDER="0">
 				<xsl:attribute name="SRC">
 					<xsl:choose>
 						<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
@@ -1779,7 +1786,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
-				<IMG BORDER="0">
+				<IMG CLASS="padded" BORDER="0">
 					<xsl:attribute name="SRC">
 						<xsl:choose>
 							<xsl:when test="(name(/child::node()[1])='tutorial') or (name(/child::node()[1])='laboratory') or /document/@class = 'tutorial' or /document/@class = 'laboratory' ">
