4 files changed, 7 insertions, 9 deletions
diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp
index 6b4ac7417e..1823bdef10 100644
--- a/plugins/AVS/src/cache.cpp
+++ b/plugins/AVS/src/cache.cpp
@@ -80,7 +80,7 @@ CacheNode* FindAvatarInCache(MCONTACT hContact, bool add, bool findAny)
 		mir_cslock lck(cachecs);
 		cc = arCache.find((CacheNode*)&hContact);
 		if (cc) {
-			cc->t_lastAccess = time(nullptr);
+			cc->t_lastAccess = time(0);
 			return (cc->loaded || findAny) ? cc : nullptr;
 		}
 
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 23bcbd79c4..18cbe3ae9d 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -317,7 +317,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	mir_snwprintf(szEventName, L"avs_loaderthread_%d", GetCurrentThreadId());
 	hLoaderEvent = CreateEvent(nullptr, TRUE, FALSE, szEventName);
 
-	SetThreadPriority(mir_forkthread(PicLoader, nullptr), THREAD_PRIORITY_IDLE);
+	SetThreadPriority(mir_forkthread(PicLoader), THREAD_PRIORITY_IDLE);
 
 	// Folders plugin support
 	hMyAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("My Avatars"), MIRANDA_USERDATAT L"\\Avatars");
diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp
index 471ca4a41f..60f9480438 100644
--- a/plugins/AVS/src/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
@@ -62,7 +62,7 @@ static mir_cs cs;
 void InitPolls()
 {
 	// Init request queue
-	mir_forkthread(RequestThread, nullptr);
+	mir_forkthread(RequestThread);
 }
 
 void UninitPolls()
diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp
index 5302ccfe36..cf7f6cafe9 100644
--- a/plugins/AVS/src/services.cpp
+++ b/plugins/AVS/src/services.cpp
@@ -718,7 +718,7 @@ INT_PTR DrawAvatarPicture(WPARAM, LPARAM lParam)
 	else ace = (AVATARCACHEENTRY *)GetAvatarBitmap((WPARAM)r->hContact, 0);
 
 	if (ace && (!(r->dwFlags & AVDRQ_RESPECTHIDDEN) || !(ace->dwFlags & AVS_HIDEONCLIST))) {
-		ace->t_lastAccess = time(nullptr);
+		ace->t_lastAccess = time(0);
 
 		if (ace->bmHeight == 0 || ace->bmWidth == 0 || ace->hbmPic == nullptr)
 			return 0;
@@ -750,12 +750,10 @@ INT_PTR GetMyAvatar(WPARAM wParam, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static void ReloadMyAvatar(LPVOID lpParam)
+static void ReloadMyAvatar(char *szProto)
 {
 	Thread_SetName("AVS: ReloadMyAvatar");
 
-	char *szProto = (char *)lpParam;
-
 	mir_sleep(500);
 	if (g_shutDown)
 		return;
@@ -785,7 +783,7 @@ static void ReloadMyAvatar(LPVOID lpParam)
 			NotifyEventHooks(hMyAvatarChanged, (WPARAM)myAvatarProto, 0);
 	}
 
-	mir_free(lpParam);
+	mir_free(szProto);
 }
 
 INT_PTR ReportMyAvatarChanged(WPARAM wParam, LPARAM)
@@ -799,7 +797,7 @@ INT_PTR ReportMyAvatarChanged(WPARAM wParam, LPARAM)
 			continue;
 
 		if (!mir_strcmp(it->szProtoname, proto)) {
-			mir_forkthread(ReloadMyAvatar, mir_strdup(it->szProtoname));
+			mir_forkThread<char>(ReloadMyAvatar, mir_strdup(it->szProtoname));
 			return 0;
 		}
 	}