diff --git a/neo/tools/guied/GEWindowWrapper.cpp b/neo/tools/guied/GEWindowWrapper.cpp
index 3cd485f3..a71aabe2 100644
--- a/neo/tools/guied/GEWindowWrapper.cpp
+++ b/neo/tools/guied/GEWindowWrapper.cpp
@@ -68,11 +68,21 @@ rvGEWindowWrapper::rvGEWindowWrapper( idWindow *window,EWindowType type ) {
 	}
 
 	// Attach the wrapper to the window by adding a defined variable
-	// with the wrappers pointer stuffed into an integer
-	// FIXME: WTF is this about?!
+	// with the wrappers pointer stuffed into (an integer) - actually a string now
+#if 0
 	idWinInt *var = new idWinInt();
 	int x = (int)this;
 	*var = x;
+#else // DG: use idWinStr, because idWinInt can't cold 64bit pointers
+	idWinStr* var = new idWinStr();
+
+	// convert this to hex-string (*without* "0x" prefix)
+	const ULONG_PTR thisULP = (ULONG_PTR)this;
+	char buf[32] = {0};
+	_ui64toa(thisULP, buf, 16);
+
+	var->Set(buf);
+#endif
 	var->SetEval(false);
 	var->SetName("guied_wrapper");
 	mWindow->AddDefinedVar(var);
@@ -88,10 +98,19 @@ Static method that returns the window wrapper for the given window class
 ================
 */
 rvGEWindowWrapper * rvGEWindowWrapper::GetWrapper( idWindow *window ) {
+#if 0
 	idWinInt *var;
 	var = dynamic_cast< idWinInt*>(window->GetWinVarByName("guied_wrapper"));
-	return var ? ((rvGEWindowWrapper *) (int) (*var)) : NULL;
-	// FIXME: this won't work!
+	return var ? ((rvGEWindowWrapper *)(int) (*var)) : NULL;
+#else
+	// DG: use idWinStr, because idWinInt can't cold 64bit pointers
+	idWinStr* var = (idWinStr*)window->GetWinVarByName("guied_wrapper");
+	if(var == NULL)
+		return NULL;
+
+	ULONG_PTR thisULP = (ULONG_PTR)_strtoui64(var->c_str(), NULL, 16);
+	return (rvGEWindowWrapper *)thisULP;
+#endif
 }
 
 /*
diff --git a/neo/ui/ChoiceWindow.cpp b/neo/ui/ChoiceWindow.cpp
index 5351466b..0e34083f 100644
--- a/neo/ui/ChoiceWindow.cpp
+++ b/neo/ui/ChoiceWindow.cpp
@@ -440,7 +440,9 @@ void idChoiceWindow::Draw(int time, float x, float y) {
 		color = hoverColor;
 	}
 
-	dc->DrawText( choices[currentChoice], textScale, textAlign, color, textRect, false, -1 );
+	if(choices.Num() > 0) {
+		dc->DrawText( choices[currentChoice], textScale, textAlign, color, textRect, false, -1 );
+	}
 }
 
 void idChoiceWindow::Activate( bool activate, idStr &act ) {