diff --git a/zefie_wtvp_minisrv/client_sim.js b/zefie_wtvp_minisrv/client_sim.js
index 6b89b7ed..52e10ce5 100644
--- a/zefie_wtvp_minisrv/client_sim.js
+++ b/zefie_wtvp_minisrv/client_sim.js
@@ -188,7 +188,6 @@ class WebTVClientSimulator {
 
     getBoxHeaders(box) {
         const config = this.getBoxConfig(box);
-        console.log(config);
         return config.join("\r\n")+"\r\n";
     }
 
@@ -854,7 +853,7 @@ class WebTVClientSimulator {
                     }
                     
                     // Parse the HTML to extract usernames and their href links
-                    if (bodyBuf.length > 0) {
+                    if (bodyBuf.length > 0 && !this.authenticated) {
                         const parseResult = this.parseLoginStageTwoHTML(bodyBuf);
                         
                         if (parseResult.selectedUser) {
@@ -1887,30 +1886,13 @@ class WebTVClientSimulator {
             
             // Check for other WebTV-specific headers that might contain URLs
             const urlHeaders = [
-                'wtv-boot-url',
-                'wtv-favorite-url', 
-                'wtv-home-url',
-                'wtv-mail-url',
-                'wtv-log-url',
                 'wtv-phone-log-url',
-                'wtv-relogin-url',
-                'wtv-reconnect-url',
-                'wtv-datadownload-url',
-                'wtv-datadownload-login-url',
-                'wtv-ssl-certs-download-url',
-                'wtv-offline-mail-connect-url',
-                'wtv-messenger-login-url',
-                'wtv-notifications-url',
-                'wtv-addresses-url',
-                'wtv-settings-url',
-                'wtv-search-url',
-                'wtv-explore-url'
             ];
             
             for (const headerName of urlHeaders) {
                 if (headers[headerName]) {
                     const headerUrl = headers[headerName];
-                    if (headerUrl && !headerUrl.startsWith('client:')) {
+                    if (headerUrl && headerUrl.startsWith('wtv-1800:')) {
                         const normalizedUrl = this.normalizeUrl(headerUrl, baseUrl);
                         if (normalizedUrl && this.isValidWebTVUrl(normalizedUrl)) {
                             urls.push(normalizedUrl);
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
index f3845ddb..a9e9a479 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
@@ -234,7 +234,7 @@ if (request_headers['wtv-request-type'] == 'download') {
                 if (wtvshared.getFileExt(diskmap_data_file).toLowerCase() == "gz") {
                     var diskmap_data_filename = path.basename(diskmap_data_file);
                     var gunzipped = zlib.gunzipSync(diskmap_file_data);
-                    diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(diskmap_file_data)).toString(CryptoJS.enc.Hex).toLowerCase();
+                    diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
                     var gzip_fn_end = diskmap_file_data.indexOf("\0", 10);
                     if (!diskmap_group_data.files[k].dont_extract_filename) {
                         diskmap_group_data.files[k].original_filename = diskmap_group_data.files[k].file.replace(diskmap_group_data.base,"").replace(diskmap_data_filename, diskmap_file_data.toString('utf8', 10, gzip_fn_end));