diff --git a/scripts/radial/structure/structure_management_terminal.py b/scripts/radial/structure/structure_management_terminal.py
index 8bdc5878..98e5dc0a 100644
--- a/scripts/radial/structure/structure_management_terminal.py
+++ b/scripts/radial/structure/structure_management_terminal.py
@@ -45,7 +45,7 @@ def handleSelection(core, owner, target, option):
 			return
 	if option == 50:
 		if owner is not None:
-			core.housingService.createRenameSUIPage(owner,target)
+			core.housingService.createRenameSUIPage(owner, owner.getGrandparent())
 			return
 	if option == 127:
 		if owner is not None:
diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java
index 2247591e..e970df7c 100644
--- a/src/resources/objects/building/BuildingObject.java
+++ b/src/resources/objects/building/BuildingObject.java
@@ -260,7 +260,7 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
 	}
 	
 	public short getMaximumStorageCapacity() {
-		return (byte) otherVariables.get("maximumStorageCapacity");
+		return (short) otherVariables.get("maximumStorageCapacity");
 	}
 	
 	public void setMaximumStorageCapacity(short maximumStorageCapacity) {