diff --git a/hdhomerun_device.c b/hdhomerun_device.c
index ff2650b..64699cc 100644
--- a/hdhomerun_device.c
+++ b/hdhomerun_device.c
@@ -377,6 +377,9 @@ static bool hdhomerun_device_get_tuner_status_lock_is_bcast(struct hdhomerun_tun
 	if (strcmp(status->lock_str, "8vsb") == 0) {
 		return true;
 	}
+	if (strcmp(status->lock_str, "atsc3") == 0) {
+		return true;
+	}
 	if (strncmp(status->lock_str, "t8", 2) == 0) {
 		return true;
 	}
diff --git a/hdhomerun_os_windows.c b/hdhomerun_os_windows.c
index ea65945..7d49179 100644
--- a/hdhomerun_os_windows.c
+++ b/hdhomerun_os_windows.c
@@ -113,6 +113,7 @@ void thread_task_join(thread_task_t tid)
 			return;
 		}
 		if (ExitCode != STILL_ACTIVE) {
+			CloseHandle(tid);
 			return;
 		}
 	}