diff --git a/masque/file/dxf.py b/masque/file/dxf.py
index 078245b..0f6dd32 100644
--- a/masque/file/dxf.py
+++ b/masque/file/dxf.py
@@ -351,7 +351,7 @@ def _shapes_to_elements(
                     )
 
             for polygon in shape.to_polygons():
-                xy_open = polygon.vertices + polygon.offset
+                xy_open = polygon.vertices
                 xy_closed = numpy.vstack((xy_open, xy_open[0, :]))
                 block.add_lwpolyline(xy_closed, dxfattribs=attribs)
 
@@ -376,5 +376,5 @@ def _mlayer2dxf(layer: layer_t) -> str:
     if isinstance(layer, int):
         return str(layer)
     if isinstance(layer, tuple):
-        return f'{layer[0]}.{layer[1]}'
+        return f'{layer[0]:d}.{layer[1]:d}'
     raise PatternError(f'Unknown layer type: {layer} ({type(layer)})')