diff --git a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java
index 4e09ec4a..f673e042 100644
--- a/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java
+++ b/laboratory/src/org/labkey/laboratory/query/EnterResultsDisplayColumn.java
@@ -10,9 +10,10 @@
 import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.view.ActionURL;
+import org.labkey.api.writer.HtmlWriter;
 
-import java.io.IOException;
-import java.io.Writer;
+import static org.labkey.api.util.DOM.TD;
+import static org.labkey.api.util.DOM.cl;
 
 /**
  * User: bimber
@@ -45,20 +46,20 @@ public String renderURL(RenderContext ctx)
     }
 
     @Override
-    public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
     {
         Object value = getValue(ctx);
         String url = renderURL(ctx);
 
         if (value != null && url != null)
         {
-            out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget).toString());
+            out.write(PageFlowUtil.link(value.toString()).href(url).target(_linkTarget));
         }
     }
 
     @Override
-    public void renderGridHeaderCell(RenderContext ctx, Writer out, String headerClass) throws IOException
+    public void renderGridHeaderCell(RenderContext ctx, HtmlWriter out, String headerClass)
     {
-        out.write("<td class=\"labkey-column-header\"></td>");
+        TD(cl("labkey-column-header")).appendTo(out);
     }
 }
diff --git a/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java b/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java
index 2eeb6f0c..3ad201b5 100644
--- a/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java
+++ b/laboratory/src/org/labkey/laboratory/query/WorkbookIdDisplayColumn.java
@@ -3,9 +3,7 @@
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DataColumn;
 import org.labkey.api.data.RenderContext;
-
-import java.io.IOException;
-import java.io.Writer;
+import org.labkey.api.writer.HtmlWriter;
 
 /**
  * User: bimber
@@ -20,9 +18,9 @@ public WorkbookIdDisplayColumn(ColumnInfo col)
     }
 
     @Override
-    public void renderGridCellContents(RenderContext ctx, Writer out) throws IOException
+    public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
     {
-        //if the lookup is broken, dont render a value
+        //if the lookup is broken, don't render a value
         Object dv = getDisplayValue(ctx);
         if (dv == null || "".equals(dv))
             return;
@@ -35,7 +33,7 @@ public Object getDisplayValue(RenderContext ctx)
     {
         Object ret = super.getDisplayValue(ctx);
 
-        //if the lookup is broken, dont render a value.  note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value
+        //if the lookup is broken, don't render a value.  note: return empty string so client API draws the distinction between deliberately empty and a genuine NULL value
         return ret == null ? "" : ret;
     }
 }
\ No newline at end of file