diff --git a/panda/src/display/nativeWindowHandle.cxx b/panda/src/display/nativeWindowHandle.cxx
index b39f2e569a..32f542c926 100644
--- a/panda/src/display/nativeWindowHandle.cxx
+++ b/panda/src/display/nativeWindowHandle.cxx
@@ -102,7 +102,7 @@ get_int_handle() const {
 ////////////////////////////////////////////////////////////////////
 void NativeWindowHandle::IntHandle::
 output(ostream &out) const {
-  out << _handle;
+  out << "(" << _handle << ")";
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -112,7 +112,7 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 void NativeWindowHandle::SubprocessHandle::
 output(ostream &out) const {
-  out << _filename;
+  out << "(" << _filename << ")";
 }
 
 #if defined(HAVE_X11) && !defined(CPPPARSER)
diff --git a/panda/src/display/windowProperties.cxx b/panda/src/display/windowProperties.cxx
index 20cb2d9e38..1d7e51f67c 100644
--- a/panda/src/display/windowProperties.cxx
+++ b/panda/src/display/windowProperties.cxx
@@ -225,8 +225,12 @@ clear() {
 ////////////////////////////////////////////////////////////////////
 void WindowProperties::
 set_parent_window(size_t parent) {
-  PT(WindowHandle) handle = NativeWindowHandle::make_int(parent);
-  set_parent_window(handle);
+  if (parent == 0) {
+    set_parent_window((WindowHandle *)NULL);
+  } else {
+    PT(WindowHandle) handle = NativeWindowHandle::make_int(parent);
+    set_parent_window(handle);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////