diff --git a/Source/inv.cpp b/Source/inv.cpp
index 324a77eed..0eb07744a 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -2100,7 +2100,6 @@ void CleanupItems(int ii)
 	dItem[item[ii]._ix][item[ii]._iy] = 0;
 
 	if (currlevel == 21 & item[ii]._ix == CornerStone.x && item[ii]._iy == CornerStone.y) {
-		CornerStone.item.IDidx = -1;
 		CornerStone.item._itype = ITYPE_NONE;
 		CornerStone.item._iSelFlag = 0;
 		CornerStone.item._ix = 0;
@@ -2415,7 +2414,7 @@ int InvPutItem(int pnum, int x, int y)
 	if (currlevel == 21 && x == CornerStone.x && y == CornerStone.y) {
 		CornerStone.item = item[ii];
 		InitQTextMsg(TEXT_CORNSTN);
-		quests[Q_CORNSTN]._qlog = FALSE;
+		quests[Q_CORNSTN]._qlog = 0;
 		quests[Q_CORNSTN]._qactive = QUEST_DONE;
 	}
 
@@ -2502,7 +2501,7 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in
 		CornerStone.item = item[ii];
 		InitQTextMsg(TEXT_CORNSTN);
 		quests[Q_CORNSTN]._qlog = 0;
-		quests[Q_CORNSTN]._qactive = 3;
+		quests[Q_CORNSTN]._qactive = QUEST_DONE;
 	}
 	return ii;
 }
diff --git a/Source/items.cpp b/Source/items.cpp
index 84493a27b..47c1b9795 100644
--- a/Source/items.cpp
+++ b/Source/items.cpp
@@ -2976,7 +2976,7 @@ void items_427A72()
 	BYTE *buffer;
 
 	if (CornerStone.activated) {
-		if (CornerStone.item.IDidx >= 0) {
+		if (!CornerStone.item.isEmpty()) {
 			PackItem(&id, &CornerStone.item);
 			buffer = (BYTE *)&id;
 			for (int i = 0; i < sizeof(PkItemStruct); i++) {
@@ -3012,7 +3012,7 @@ void items_427ABA(int x, int y)
 		return;
 	}
 
-	CornerStone.item.IDidx = 0;
+	CornerStone.item._itype = ITYPE_NONE;
 	CornerStone.activated = TRUE;
 	if (dItem[x][y]) {
 		int ii = dItem[x][y] - 1;