diff --git a/src/hal/ethernet/linux/ethernet_linux.c b/src/hal/ethernet/linux/ethernet_linux.c
index 6715c526..538a5e0e 100644
--- a/src/hal/ethernet/linux/ethernet_linux.c
+++ b/src/hal/ethernet/linux/ethernet_linux.c
@@ -63,7 +63,9 @@ void
 EthernetHandleSet_addSocket(EthernetHandleSet self, const EthernetSocket sock)
 {
     if (self != NULL && sock != NULL) {
+
         int i = self->nhandles++;
+
         self->handles = realloc(self->handles, self->nhandles * sizeof(struct pollfd));
 
         self->handles[i].fd = sock->rawSocket;
@@ -75,7 +77,9 @@ void
 EthernetHandleSet_removeSocket(EthernetHandleSet self, const EthernetSocket sock)
 {
     if ((self != NULL) && (sock != NULL)) {
-        unsigned i;
+
+        int i;
+
         for (i = 0; i < self->nhandles; i++) {
             if (self->handles[i].fd == sock->rawSocket) {
                 memmove(&self->handles[i], &self->handles[i+1], sizeof(struct pollfd) * (self->nhandles - i - 1));
diff --git a/src/hal/ethernet/win32/ethernet_win32.c b/src/hal/ethernet/win32/ethernet_win32.c
index df76eaab..4b4f10ca 100644
--- a/src/hal/ethernet/win32/ethernet_win32.c
+++ b/src/hal/ethernet/win32/ethernet_win32.c
@@ -138,7 +138,9 @@ void
 EthernetHandleSet_addSocket(EthernetHandleSet self, const EthernetSocket sock)
 {
     if (self != NULL && sock != NULL) {
+
         int i = self->nhandles++;
+
         self->handles = (HANDLE *) realloc(self->handles, self->nhandles * sizeof(HANDLE));
             
         self->handles[i] = pcap_getevent(sock->rawSocket);
@@ -149,9 +151,10 @@ void
 EthernetHandleSet_removeSocket(EthernetHandleSet self, const EthernetSocket sock)
 {
     if ((self != NULL) && (sock != NULL)) {
-        HANDLE h = pcap_getevent(socket->rawSocket);
+        HANDLE h = pcap_getevent(sock->rawSocket);
+
+        int i;
 
-        unsigned i;
         for (i = 0; i < self->nhandles; i++) {
             if (self->handles[i] == h) {
                 memmove(&self->handles[i], &self->handles[i+1], sizeof(HANDLE) * (self->nhandles - i - 1));