diff --git a/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp b/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
index b7af5c0..41a75e9 100644
--- a/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
+++ b/TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
@@ -247,13 +247,14 @@ __declspec(dllexport) void TITCALL DebugLoop()
             }
 
             //maintain thread list
-            int threadcount=hListThread.size();
-            for(int i=0; i<threadcount; i++)
+            for(unsigned int i = 0; i < hListThread.size(); i++)
             {
                 if(hListThread.at(i).dwThreadId == DBGEvent.dwThreadId) //found the thread to remove
                 {
                     //TODO: close handle?
-                    hListThread.erase(hListThread.begin()+i);
+                    EngineCloseHandle(hListThread.at(i).hThread);
+
+                    hListThread.erase(hListThread.begin() + i);
                     break;
                 }
             }
@@ -313,8 +314,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
                         WideCharToMultiByte(CP_ACP, NULL, NewLibraryData.szLibraryName, -1, szAnsiLibraryName, sizeof szAnsiLibraryName, NULL, NULL);
 
                         //library breakpoint
-                        int libbpcount=LibrarianData.size();
-                        for(int i=libbpcount-1; i>-1; i--)
+                        for(int i = LibrarianData.size() - 1; i >= 0; i--)
                         {
                             ptrLibrarianData=&LibrarianData.at(i);
                             if(!lstrcmpiA(ptrLibrarianData->szLibraryName, szAnsiLibraryName))
@@ -378,10 +378,10 @@ __declspec(dllexport) void TITCALL DebugLoop()
             {
                 RtlZeroMemory(szAnsiLibraryName, sizeof(szAnsiLibraryName));
                 WideCharToMultiByte(CP_ACP, NULL, hLoadedLibData->szLibraryName, -1, szAnsiLibraryName, sizeof szAnsiLibraryName, NULL, NULL);
-                int libbpcount=LibrarianData.size();
-                for(int i=libbpcount-1; i>-1; i--)
+
+                for(int i= LibrarianData.size() - 1; i >= 0; i--)
                 {
-                    ptrLibrarianData=&LibrarianData.at(i);
+                    ptrLibrarianData = &LibrarianData.at(i);
                     if(!lstrcmpiA(ptrLibrarianData->szLibraryName, szAnsiLibraryName))
                     {
                         if(ptrLibrarianData->bpxType == UE_ON_LIB_UNLOAD || ptrLibrarianData->bpxType == UE_ON_LIB_ALL)
@@ -405,8 +405,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
             }
 
             //maintain library list
-            int libcount=hListLibrary.size();
-            for(int i=0; i<libcount; i++)
+            for(unsigned int i = 0; i < hListLibrary.size(); i++)
             {
                 if(hListLibrary.at(i).BaseOfDll == DBGEvent.u.UnloadDll.lpBaseOfDll &&
                         hListLibrary.at(i).hFile != INVALID_HANDLE_VALUE)
diff --git a/TitanEngine/TitanEngine.Librarian.cpp b/TitanEngine/TitanEngine.Librarian.cpp
index d8348a4..4b81e48 100644
--- a/TitanEngine/TitanEngine.Librarian.cpp
+++ b/TitanEngine/TitanEngine.Librarian.cpp
@@ -61,7 +61,7 @@ __declspec(dllexport) void* TITCALL LibrarianGetLibraryInfoW(wchar_t* szLibraryN
     static LIBRARY_ITEM_DATAW LibraryInfo;
     memset(&LibraryInfo, 0, sizeof(LIBRARY_ITEM_DATAW));
     
-    for(int i = 0; i < hListLibrary.size(); i++)
+    for(unsigned int i = 0; i < hListLibrary.size(); i++)
     {
         if(hListLibrary.at(i).hFile != INVALID_HANDLE_VALUE && !lstrcmpiW(hListLibrary.at(i).szLibraryName, szLibraryName))
         {
@@ -98,7 +98,7 @@ __declspec(dllexport) void* TITCALL LibrarianGetLibraryInfoExW(void* BaseOfDll)
     static LIBRARY_ITEM_DATAW LibraryData;
     memset(&LibraryData, 0, sizeof(LIBRARY_ITEM_DATAW));
 
-    for(int i = 0; i < hListLibrary.size(); i++)
+    for(unsigned int i = 0; i < hListLibrary.size(); i++)
     {
         if(hListLibrary.at(i).hFile != INVALID_HANDLE_VALUE && hListLibrary.at(i).BaseOfDll == BaseOfDll)
         {
@@ -118,9 +118,8 @@ __declspec(dllexport) void TITCALL LibrarianEnumLibraryInfo(void* EnumCallBack)
 
     typedef void(TITCALL *fEnumCallBack)(LPVOID fLibraryDetail);
     fEnumCallBack myEnumCallBack = (fEnumCallBack)EnumCallBack;
-    int libcount = hListLibrary.size();
 
-    for(int i = 0; i < libcount; i++)
+    for(unsigned int i = 0; i < hListLibrary.size(); i++)
     {
         if(hListLibrary.at(i).hFile != INVALID_HANDLE_VALUE)
         {
@@ -151,9 +150,8 @@ __declspec(dllexport) void TITCALL LibrarianEnumLibraryInfoW(void* EnumCallBack)
 
     typedef void(TITCALL *fEnumCallBack)(LPVOID fLibraryDetail);
     fEnumCallBack myEnumCallBack = (fEnumCallBack)EnumCallBack;
-    int libcount = hListLibrary.size();
 
-    for(int i = 0; i < libcount; i++)
+    for(unsigned int i = 0; i < hListLibrary.size(); i++)
     {
         if(hListLibrary.at(i).hFile != INVALID_HANDLE_VALUE)
         {