diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c
index bd8c51125..80df257c1 100644
--- a/iscsi-scst/usr/iscsi_scstd.c
+++ b/iscsi-scst/usr/iscsi_scstd.c
@@ -25,7 +25,7 @@
 #include <netdb.h>
 #include <signal.h>
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/iscsi-scst/usr/iscsid.h b/iscsi-scst/usr/iscsid.h
index dbb911d74..278d942df 100644
--- a/iscsi-scst/usr/iscsid.h
+++ b/iscsi-scst/usr/iscsid.h
@@ -19,7 +19,7 @@
 
 #include <search.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <assert.h>
 #include <netdb.h>
 #include <syslog.h>
diff --git a/qla2x00t-32gbit/qla_nx.c b/qla2x00t-32gbit/qla_nx.c
index 7c7e05dbd..8b94604e0 100644
--- a/qla2x00t-32gbit/qla_nx.c
+++ b/qla2x00t-32gbit/qla_nx.c
@@ -746,7 +746,11 @@ static int qla82xx_pci_mem_read_direct(struct qla_hw_data *ha,
 		*(u32 *)data = readl(addr);
 		break;
 	case 8:
+#ifdef CONFIG_64BIT
 		*(u64 *)data = readq(addr);
+#else
+		WARN_ON_ONCE(true);
+#endif
 		break;
 	default:
 		ret = -1;
@@ -817,7 +821,11 @@ qla82xx_pci_mem_write_direct(struct qla_hw_data *ha,
 		writel(*(u32 *)data, addr);
 		break;
 	case 8:
+#ifdef CONFIG_64BIT
 		writeq(*(u64 *)data, addr);
+#else
+		WARN_ON_ONCE(true);
+#endif
 		break;
 	default:
 		ret = -1;
diff --git a/qla2x00t/qla_nx.c b/qla2x00t/qla_nx.c
index 748b6891c..52da5fd3b 100644
--- a/qla2x00t/qla_nx.c
+++ b/qla2x00t/qla_nx.c
@@ -559,8 +559,7 @@ qla82xx_idc_unlock(struct qla_hw_data *ha)
 }
 
 /*  PCI Windowing for DDR regions.  */
-static inline bool QLA82XX_ADDR_IN_RANGE(uintptr_t addr, uintptr_t low,
-					 uintptr_t high)
+static inline bool QLA82XX_ADDR_IN_RANGE(u64 addr, u64 low, u64 high)
 {
 	return addr <= high && addr >= low;
 }
diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c
index b78861fbf..e880e44ce 100644
--- a/scst/src/dev_handlers/scst_user.c
+++ b/scst/src/dev_handlers/scst_user.c
@@ -2311,7 +2311,7 @@ static int dev_user_reply_get_cmd(struct file *file,
 	int res = 0, rc;
 	struct scst_user_dev *dev;
 	struct scst_user_reply_cmd reply;
-	uint64_t ureply;
+	uintptr_t ureply;
 
 	TRACE_ENTRY();
 
diff --git a/usr/events/events.c b/usr/events/events.c
index 5cc1ca561..5f0151e05 100644
--- a/usr/events/events.c
+++ b/usr/events/events.c
@@ -17,7 +17,7 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/user.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 
 #include <pthread.h>
diff --git a/usr/fileio/common.c b/usr/fileio/common.c
index 830d7aa96..caea6b296 100644
--- a/usr/fileio/common.c
+++ b/usr/fileio/common.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <arpa/inet.h>
 
diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c
index 140ba7b65..56962bcd1 100644
--- a/usr/fileio/fileio.c
+++ b/usr/fileio/fileio.c
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/user.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 
 #include <pthread.h>
diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c
index 584df5bab..04027f0bb 100644
--- a/usr/stpgd/stpgd_main.c
+++ b/usr/stpgd/stpgd_main.c
@@ -9,9 +9,10 @@
 #include <malloc.h>
 #include <inttypes.h>
 #include <sys/wait.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <syslog.h>
diff --git a/www/users.html b/www/users.html
index a489ea39a..74caaa5e3 100644
--- a/www/users.html
+++ b/www/users.html
@@ -44,15 +44,17 @@
 				<table width="100%" border="0" cellpadding="0" cellspacing="0" style="margin: 10px 15px;">
 				<tr>
 					<td class="companybox" width="33%">
-						<a href="http://www.avagotech.com/products/server-storage/fibre-channel-host-bus-adapters/onecore-storage-sdk"><img src="images/avago.jpg" alt="Emulex"></a></td>
-					<td class="companybox" width="33%" bgcolor="#0071bb">
-						<a href="https://cavium.com/"><img src="https://cavium.com/images/cavium-logo.png" style="width: 180px; height: 40px" alt="Cavium"></a></td>
+						<a href="http://qlogic.com"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/QLogic_Logo2.png/300px-QLogic_Logo2.png" style="height: 80px" alt="QLogic"></a></td>
 					<td class="companybox" width="33%">
-						<a href="http://www.marvell.com"><img src="http://www.marvell.com/assets/img/logo.png" alt="Marvell Technology Group"></a></td>
+						<a href="http://www.avagotech.com/products/server-storage/fibre-channel-host-bus-adapters/onecore-storage-sdk"><img src="https://upload.wikimedia.org/wikipedia/en/f/fc/Emulex-logo.png" alt="Emulex"></a></td>
+					<td class="companybox" width="33%">
+						<a href="http://www.marvell.com"><img src="https://www.marvell.com/content/dam/marvell/en/rebrand/marvell-logo.svg" alt="Marvell Technology Group"></a></td>
 				</tr>
 				<tr>
 					<td class="companybox" width="33%">
-						<a href="http://www.mellanox.com"><img src="http://ir.mellanox.com/common/alerts/MLNX/default/logo.gif" alt="Mellanox Technologies"></a></td>
+						<a href="http://www.mellanox.com"><img src="https://www.mellanox.com/themes/custom/mellanox/logo.svg" alt="Mellanox Technologies"></a></td>
+					<td class="companybox" width="33%">
+						<a href="http://www.atto.com"><img src="https://www.atto.com/assets/img/logo/atto-logo.png" alt="ATTO"></a></td>
 				</tr>
 				</table>
 
@@ -71,14 +73,14 @@
 				</tr>
 				<tr>
 					<td class="companybox" width="33%">
-						<a href="http://www.datadomain.com"><img src="http://www.emc.com/images/header/logo-emc.gif" alt="Data Domain"></a></td>
+						<a href="http://www.emc.com"><img src="http://www.emc.com/images/header/logo-emc.gif" alt="Data Domain"></a></td>
 					<td class="companybox" width="33%">
 						<font size="3" color="black">Enjellic Systems Development</font></td>
 					<td class="companybox" width="33%">
 						<a href="http://www.hp.com"><img src="hp_logo.jpg" alt="Hewlett-Packard"></a></td>
 				</tr>
 				<tr>
-					<td class="companybox" width="33%" bgcolor="#3a3c41">
+					<td class="companybox" width="33%">
 						<a href="http://www.ibm.com"><img src="http://www.ibm.com/i/v16/t/ibm-logo.gif" alt="IBM"></a></td>
 					<td class="companybox" width="33%">
 						<a href="http://www.inmage.com/"><img src="http://www.inmage.com/uploads/inmage/logo.jpg" alt="InMage"></a></td>
@@ -104,7 +106,7 @@
 				<tr>
 					<td class="companybox" width="33%" bgcolor="#3a3c41">
 						<a href="http://www.osnexus.com"><img src="http://static1.squarespace.com/static/545a62d4e4b02643996231f0/t/545aa6d4e4b018968b9a709f/1444157883463/?format=1500w" style="width: 180px; height: 40px" alt="OS NEXUS"></a></td>
-					<td class="companybox" width="33%" bgcolor="black">
+					<td class="companybox" width="33%">
 						<a href="http://www.pranah.com"><img src="http://www.pranah.com/images/logo_pranah.png" alt="Pranah Storage Technologies"></a></td>
 					<td class="companybox" width="33%">
 						<a href="http://www.proxmox.com"><img src="https://www.proxmox.com/images/proxmox/Proxmox_logo_standard_hex_400px.png" style="width: 180px; height: 40px" alt="Proxmox"></a></td>