diff --git a/compiler/base/hierarchy_layout.py b/compiler/base/hierarchy_layout.py
index e033e387..f16658c2 100644
--- a/compiler/base/hierarchy_layout.py
+++ b/compiler/base/hierarchy_layout.py
@@ -1409,7 +1409,7 @@ class layout():
         [ll, ur] = bbox
 
         # Possibly inflate the bbox
-        nwell_offset = vector(self.nwell_width, self.nwell_width)
+        nwell_offset = vector(2 * self.nwell_width, 2 * self.nwell_width)
         ll -= nwell_offset.scale(inflate, inflate)
         ur += nwell_offset.scale(inflate, inflate)
 
@@ -1448,7 +1448,7 @@ class layout():
                                           to_layer="m1",
                                           offset=loc)
             else:
-                self.add_power_pin(name="gnd",
+                self.add_power_pin(name="vdd",
                                    loc=loc,
                                    start_layer="li")
             count += 1
@@ -1468,7 +1468,7 @@ class layout():
                                           to_layer="m1",
                                           offset=loc)
             else:
-                self.add_power_pin(name="gnd",
+                self.add_power_pin(name="vdd",
                                    loc=loc,
                                    start_layer="li")
             count += 1
@@ -1488,7 +1488,7 @@ class layout():
                                           to_layer="m2",
                                           offset=loc)
             else:
-                self.add_power_pin(name="gnd",
+                self.add_power_pin(name="vdd",
                                    loc=loc,
                                    start_layer="li")
             count += 1
@@ -1508,7 +1508,7 @@ class layout():
                                           to_layer="m2",
                                           offset=loc)
             else:
-                self.add_power_pin(name="gnd",
+                self.add_power_pin(name="vdd",
                                    loc=loc,
                                    start_layer="li")
             count += 1
diff --git a/compiler/router/router.py b/compiler/router/router.py
index d9903e49..d5bd4738 100644
--- a/compiler/router/router.py
+++ b/compiler/router/router.py
@@ -881,7 +881,7 @@ class router(router_tech):
         """
         pg = pin_group(name, [], self)
         # Offset two spaces inside and one between the rings
-        if name == "vdd":
+        if name == "gnd":
             offset = width + 2 * space
         else:
             offset = space
@@ -911,7 +911,7 @@ class router(router_tech):
         pg = pin_group(name, [], self)
         # Offset two spaces inside and one between the rings
         # Units are in routing grids
-        if name == "vdd":
+        if name == "gnd":
             offset = width + 2 * space
         else:
             offset = space