diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 20f41408c..9908e8a2d 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -657,7 +657,8 @@ int DoMakeCurrent( __GLXclientState *cl,
 
     if (prevglxc) {
 	if (prevglxc->drawPixmap) {
-	    if (prevglxc->drawPixmap != prevglxc->readPixmap) {
+	    if (prevglxc->readPixmap &&
+		prevglxc->drawPixmap != prevglxc->readPixmap) {
 		/*
 		** The previous drawable was a glx pixmap, release it.
 		*/
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 74b2a3488..c5a022bf9 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -424,7 +424,7 @@ FindPCIVideoInfo(void)
 	    if ((pcrp->pci_command & PCI_CMD_MEM_ENABLE) &&
 		(num == 1 ||
 		 ((info->class == PCI_CLASS_DISPLAY) &&
-		  (info->subclass == PCI_SUBCLASS_DISPLAY_MISC)))) {
+		  (info->subclass == PCI_SUBCLASS_DISPLAY_VGA)))) {
 		if (primaryBus.type == BUS_NONE) {
 		    primaryBus.type = BUS_PCI;
 		    primaryBus.id.pci.bus = pcrp->busnum;
diff --git a/include/servermd.h b/include/servermd.h
index 994f5c087..c2c11fa73 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -153,7 +153,7 @@ SOFTWARE.
 
 #endif /* __arm32__ */
 
-#if defined (hpux)
+#if defined (hpux) || defined __hppa__
 
 #define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
@@ -165,7 +165,7 @@ SOFTWARE.
 #define LARGE_INSTRUCTION_CACHE
 #define PLENTIFUL_REGISTERS
 
-#endif /* hpux */
+#endif /* hpux || __hppa__ */
 
 #if defined(__powerpc__)