diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c
index 379e366..d8f20cd 100644
--- a/meshcore/agentcore.c
+++ b/meshcore/agentcore.c
@@ -1930,6 +1930,11 @@ int agent_GenerateCertificates(MeshAgentHostContainer *agent, char* certfile)
 	int len = -1;
 	char* str;
 
+#ifdef WIN32
+	// If there is a cert here, it was Generated by OpenSSL, so we'll force the regenerate to use OpenSSL, to honor how the current cert was generated
+	if (agent->noCertStore == 0) { agent->noCertStore = ILibSimpleDataStore_Get(agent->masterDb, "SelfNodeCert", NULL, 0); }
+#endif
+
 	// Clear the certs in the database.
 	ILibSimpleDataStore_Delete(agent->masterDb, "SelfNodeCert");
 	ILibSimpleDataStore_Delete(agent->masterDb, "SelfNodeTlsCert");
@@ -1940,7 +1945,7 @@ int agent_GenerateCertificates(MeshAgentHostContainer *agent, char* certfile)
 	{
 #if defined(WIN32)
 		char *rootSubject = (agent->capabilities & MeshCommand_AuthInfo_CapabilitiesMask_RECOVERY) == MeshCommand_AuthInfo_CapabilitiesMask_RECOVERY ? "CN=MeshNodeDiagnosticCertificate" : "CN=MeshNodeCertificate";
-		if (wincrypto_open(TRUE, rootSubject) == 0) // Force certificate re-generation
+		if (agent->noCertStore == 0 && wincrypto_open(TRUE, rootSubject) == 0) // Force certificate re-generation
 		{
 			int l;
 			do {
@@ -2051,7 +2056,7 @@ int agent_LoadCertificates(MeshAgentHostContainer *agent)
 
 		// No cert in this .db file. Try to load or generate a root certificate from a Windows crypto provider. This can be TPM backed which is great.
 		// However, if we don't have the second cert created, we need to regen the root...
-		if (wincrypto_open(FALSE, rootSubject) == 0 && ILibSimpleDataStore_Get(agent->masterDb, "SelfNodeTlsCert", NULL, 0) != 0)
+		if (agent->noCertStore == 0 && wincrypto_open(FALSE, rootSubject) == 0 && ILibSimpleDataStore_Get(agent->masterDb, "SelfNodeTlsCert", NULL, 0) != 0)
 		{
 			char* str = NULL;
 			int l;
@@ -3715,6 +3720,14 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
 		{ 
 			agentHost->capabilities |= MeshCommand_AuthInfo_CapabilitiesMask_RECOVERY; parseCommands = 0; 
 		}
+		if (strcmp(param[ri], "-nocertstore") == 0)
+		{
+			parseCommands = 0;
+#ifdef WIN32
+			printf("** Not using Certificate Store **\n");
+			agentHost->noCertStore = 1;
+#endif
+		}
 	}
 
 
@@ -3953,11 +3966,14 @@ int MeshAgent_AgentMode(MeshAgentHostContainer *agentHost, int paramLen, char **
 			else { RegDeleteKeyA(hKey, "DiagnosticAgentNodeId"); }
 		}
 
-		int NodeIDLen = 0;
-		if ((NodeIDLen = ILibSimpleDataStore_Get(agentHost->masterDb, "NodeID", ILibScratchPad, (int)sizeof(ILibScratchPad))) == 0 || !(NodeIDLen == (int)sizeof(agentHost->g_selfid) && memcmp(agentHost->g_selfid, ILibScratchPad, NodeIDLen)==0))
+		if (ILibSimpleDataStore_Get(agentHost->masterDb, "SelfNodeCert", NULL, 0) == 0)
 		{
-			// NodeID isn't saved to db, so let's put it there
-			ILibSimpleDataStore_PutEx(agentHost->masterDb, "NodeID", 6, agentHost->g_selfid, (int)sizeof(agentHost->g_selfid));
+			int NodeIDLen = 0;
+			if ((NodeIDLen = ILibSimpleDataStore_Get(agentHost->masterDb, "NodeID", ILibScratchPad, (int)sizeof(ILibScratchPad))) == 0 || !(NodeIDLen == (int)sizeof(agentHost->g_selfid) && memcmp(agentHost->g_selfid, ILibScratchPad, NodeIDLen) == 0))
+			{
+				// NodeID isn't saved to db, so let's put it there
+				ILibSimpleDataStore_PutEx(agentHost->masterDb, "NodeID", 6, agentHost->g_selfid, (int)sizeof(agentHost->g_selfid));
+			}
 		}
 
 		// Close the registry key
diff --git a/meshcore/agentcore.h b/meshcore/agentcore.h
index 90d692f..87e9f01 100644
--- a/meshcore/agentcore.h
+++ b/meshcore/agentcore.h
@@ -180,6 +180,9 @@ typedef struct MeshAgentHostContainer
 	char agentHash[UTIL_SHA384_HASHSIZE];
 	char serverHash[UTIL_SHA384_HASHSIZE];
 #ifndef MICROSTACK_NOTLS
+#ifdef WIN32
+	int noCertStore;
+#endif
 	struct util_cert selfcert;
 	struct util_cert selftlscert;
 	char serverWebHash[UTIL_SHA384_HASHSIZE];
diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c
index fa2366a..3899323 100644
--- a/microscript/ILibDuktape_Polyfills.c
+++ b/microscript/ILibDuktape_Polyfills.c
@@ -1940,8 +1940,8 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx)
 
 
 	// Mesh Agent NodeID helper, refer to modules/_agentNodeId.js
-	duk_peval_string_noresult(ctx, "addModule('_agentNodeId', Buffer.from('LyoKQ29weXJpZ2h0IDIwMTkgSW50ZWwgQ29ycG9yYXRpb24KCkxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwp5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCllvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAoKICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAoKVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQpkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLApXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZApsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKi8KCmZ1bmN0aW9uIF9tZXNoTm9kZUlkKCkNCnsNCiAgICB2YXIgcmV0ID0gJyc7DQogICAgc3dpdGNoIChwcm9jZXNzLnBsYXRmb3JtKQ0KICAgIHsNCiAgICAgICAgY2FzZSAnbGludXgnOg0KICAgICAgICBjYXNlICdkYXJ3aW4nOg0KICAgICAgICAgICAgdHJ5DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdmFyIGRiID0gcmVxdWlyZSgnU2ltcGxlRGF0YVN0b3JlJykuQ3JlYXRlKHByb2Nlc3MuZXhlY1BhdGggKyAnLmRiJywgeyByZWFkT25seTogdHJ1ZSB9KTsNCiAgICAgICAgICAgICAgICByZXQgPSByZXF1aXJlKCd0bHMnKS5sb2FkQ2VydGlmaWNhdGUoeyBwZng6IGRiLkdldEJ1ZmZlcignU2VsZk5vZGVDZXJ0JyksIHBhc3NwaHJhc2U6ICdoaWRkZW4nIH0pLmdldEtleUhhc2goKS50b1N0cmluZygnaGV4Jyk7DQogICAgICAgICAgICB9DQogICAgICAgICAgICBjYXRjaChlKQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgYnJlYWs7DQogICAgICAgIGNhc2UgJ3dpbjMyJzoNCiAgICAgICAgICAgIC8vIEZpcnN0IENoZWNrIGlmIHRoZSBkYiBDb250YWlucyB0aGUgTm9kZUlEDQogICAgICAgICAgICB0cnkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICB2YXIgZGIgPSByZXF1aXJlKCdTaW1wbGVEYXRhU3RvcmUnKS5DcmVhdGUocHJvY2Vzcy5leGVjUGF0aC5yZXBsYWNlKCcuZXhlJywgJy5kYicpLCB7IHJlYWRPbmx5OiB0cnVlIH0pOw0KICAgICAgICAgICAgICAgIHZhciB2ID0gZGIuR2V0QnVmZmVyKCdOb2RlSUQnKTsNCiAgICAgICAgICAgICAgICBpZih2IT1udWxsKQ0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgcmV0ID0gdi50b1N0cmluZygnaGV4Jyk7DQogICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIGVsc2UNCiAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgIHJldCA9IHJlcXVpcmUoJ3RscycpLmxvYWRDZXJ0aWZpY2F0ZSh7IHBmeDogZGIuR2V0QnVmZmVyKCdTZWxmTm9kZUNlcnQnKSwgcGFzc3BocmFzZTogJ2hpZGRlbicgfSkuZ2V0S2V5SGFzaCgpLnRvU3RyaW5nKCdoZXgnKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICB9DQogICAgICAgICAgICBjYXRjaCAoZSkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICBkZWZhdWx0Og0KICAgICAgICAgICAgYnJlYWs7DQogICAgfQ0KICAgIHJldHVybiAocmV0KTsNCn0NCg0KbW9kdWxlLmV4cG9ydHMgPSBfbWVzaE5vZGVJZDsNCg0K', 'base64').toString());");
-	
+	duk_peval_string_noresult(ctx, "addModule('_agentNodeId', Buffer.from('LyoKQ29weXJpZ2h0IDIwMTkgSW50ZWwgQ29ycG9yYXRpb24KCkxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwp5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCllvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAoKICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAoKVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQpkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLApXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZApsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKi8KCmZ1bmN0aW9uIF9tZXNoTm9kZUlkKCkNCnsNCiAgICB2YXIgcmV0ID0gJyc7DQogICAgc3dpdGNoIChwcm9jZXNzLnBsYXRmb3JtKQ0KICAgIHsNCiAgICAgICAgY2FzZSAnbGludXgnOg0KICAgICAgICBjYXNlICdkYXJ3aW4nOg0KICAgICAgICAgICAgdHJ5DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgdmFyIGRiID0gcmVxdWlyZSgnU2ltcGxlRGF0YVN0b3JlJykuQ3JlYXRlKHByb2Nlc3MuZXhlY1BhdGggKyAnLmRiJywgeyByZWFkT25seTogdHJ1ZSB9KTsNCiAgICAgICAgICAgICAgICByZXQgPSByZXF1aXJlKCd0bHMnKS5sb2FkQ2VydGlmaWNhdGUoeyBwZng6IGRiLkdldEJ1ZmZlcignU2VsZk5vZGVDZXJ0JyksIHBhc3NwaHJhc2U6ICdoaWRkZW4nIH0pLmdldEtleUhhc2goKS50b1N0cmluZygnaGV4Jyk7DQogICAgICAgICAgICB9DQogICAgICAgICAgICBjYXRjaChlKQ0KICAgICAgICAgICAgew0KICAgICAgICAgICAgfQ0KICAgICAgICAgICAgYnJlYWs7DQogICAgICAgIGNhc2UgJ3dpbjMyJzoNCiAgICAgICAgICAgIC8vIEZpcnN0IENoZWNrIGlmIHRoZSBkYiBDb250YWlucyB0aGUgTm9kZUlEDQogICAgICAgICAgICB0cnkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICB2YXIgZGIgPSByZXF1aXJlKCdTaW1wbGVEYXRhU3RvcmUnKS5DcmVhdGUocHJvY2Vzcy5leGVjUGF0aC5yZXBsYWNlKCcuZXhlJywgJy5kYicpLCB7IHJlYWRPbmx5OiB0cnVlIH0pOw0KICAgICAgICAgICAgICAgIHZhciB2ID0gZGIuR2V0QnVmZmVyKCdTZWxmTm9kZUNlcnQnKTsNCiAgICAgICAgICAgICAgICBpZiAodikNCiAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgIHRyeQ0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICByZXQgPSByZXF1aXJlKCd0bHMnKS5sb2FkQ2VydGlmaWNhdGUoeyBwZng6IHYsIHBhc3NwaHJhc2U6ICdoaWRkZW4nIH0pLmdldEtleUhhc2goKS50b1N0cmluZygnaGV4Jyk7DQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgY2F0Y2goZSkNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgdiA9IG51bGw7DQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgaWYgKHYgPT0gbnVsbCAmJiAodiA9IGRiLkdldEJ1ZmZlcignTm9kZUlEJykpICE9IE5VTEwpDQogICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICByZXQgPSB2LnRvU3RyaW5nKCdoZXgnKTsNCiAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICB9DQogICAgICAgICAgICBjYXRjaCAoZSkNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgIH0NCiAgICAgICAgICAgIGJyZWFrOw0KICAgICAgICBkZWZhdWx0Og0KICAgICAgICAgICAgYnJlYWs7DQogICAgfQ0KICAgIHJldHVybiAocmV0KTsNCn0NCg0KbW9kdWxlLmV4cG9ydHMgPSBfbWVzaE5vZGVJZDsNCg0K', 'base64').toString());");
+
 	// Task Scheduler, refer to modules/task-scheduler.js
 	char *_taskscheduler = ILibMemory_Allocate(44751, 0, NULL, NULL);
 	memcpy_s(_taskscheduler + 0, 25572, "/*
Copyright 2019 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var promise = require('promise');
var servicemanager = require('service-manager');
var mgr = new servicemanager();

//attachDebugger({ webport: 9995, wait: 1 }).then(console.log);

function task()
{
    this._ObjectID = 'task-scheduler';

    this.create = function create(options)
    {
        var ret = new promise(function (res, rej) { this._res = res; this._rej = rej; });
        if(options.name && options.service)
        {
            switch(process.platform)
            {
                case 'win32':
                    var parms = ['schtasks', '/Create', '/RU SYSTEM'];
                    for (var ftype in options)
                    {
                        switch(ftype.toUpperCase())
                        {
                            case 'MINUTE':
                            case 'HOURLY':
                            case 'DAILY':
                            case 'WEEKLY':
                            case 'MONTHLY':
                                parms.push('/SC ' + ftype.toUpperCase());
                                parms.push('/MO ' + options[ftype]);
                                break;
                            case 'DAY':
                                parms.push('/D ' + options[ftype]);
                                break;
                            case 'MONTH':
                                parms.push('/M ' + options[ftype]);
                                break;
                            case 'TIME':
                                parms.push('/ST ' + options[ftype]);
                                break;
                            case 'NAME':
                                parms.push('/TN "' + options[ftype].split('/').join('\\') + '"');
                                break;
                            case 'SERVICE':
                                parms.push('/TR "net start ' + options[ftype] + '"');
                                break;
                        }
                    }
                    console.log(parms.join(' '));
                    ret.child = require('child_process').execFile(process.env['windir'] + '\\system32\\schtasks.exe', parms);
                    ret.child.stdout.str = '';
                    ret.child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
                    ret.child.stderr.on('data', function (chunk) { });
                    ret.child.promise = ret;
                    ret.child.on('exit', function (code) { if (code == 0) { this.promise._res(); } else { this.promise._rej(code); }}); 
                    break;
                case 'linux':
                    if (require('fs').existsSync('/etc/cron.d/' + options.name.split('/').join('_').split('.').join('')))
                    {
                        ret._rej('Task [' + options.name + '] Already exists');
                        return (ret);
                    }
                    var minute = '*';
                    var hour = '*';
                    var day = '*';
                    var month = '*';
                    var weekday = '*';
                    for (var ftype in options)
                    {
                        switch(ftype.toUpperCase())
                        {
                            case 'MINUTE':
                                if (!options.TIME && !options.time)
                                {
                                    minute = '*/' + options[ftype];
                                }
                                break;
                            case 'HOURLY':
                                if (!options.TIME && !options.time)
                                {
                                    hour = '*/' + options[ftype];
                                }
                                break;
                            case 'DAILY':
                                day = '*/' + options[ftype];
                                break;
                            case 'WEEKLY':
                                if (options[ftype] == 1)
                                {
                                    if(!options.DAY && !options.day)
                                    {
                                        weekday = 0;
                                    }
                                }
                                else
                                {
                                    ret._rej('Only Once/Weekly supported on Linux');
                                    return (ret);
                                }
                                break;
                            case 'DAY':
                                if (options.weekly || options.WEEKLY)
                                {
                                    weekday = options[ftype];
                                }
                                else
                                {
                                    day = options[ftype];
                                }
                                break;
                            case 'TIME':
                                hour = options[ftype].split(':')[0];
                                minute = options[ftype].split(':')[1];
                                break;
                            case 'MONTHLY':
                                month = '*/' + options[ftype];
                                break;
                        }
                    }

                    var action = 'SHELL=/bin/sh\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n\n';
                    action += (minute + ' ' + hour + ' ' + day + ' ' + month + ' ' + weekday + '   root   ');
                    switch(require('service-manager').manager.getServiceType())
                    {
                        case 'init':
                            var child = require('child_process').execFile('/bin/sh', ['sh']);
                            child.stdout.str = '';
                            child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
                            child.stderr.on('data', function (chunk) { });
                            child.stdin.write("whereis service | awk '{print $2}'\n\exit\n");
                            child.waitExit();
                            child.stdout.str = child.stdout.str.trim();
                            action += (child.stdout.str + ' ' + options.service + ' restart >/dev/null 2>&1 \n');
                            break;
                        case 'upstart':
                            var child = require('child_process').execFile('/bin/sh', ['sh']);
                            child.stdout.str = '';
                            child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
                            child.stderr.on('data', function (chunk) { });
                            child.stdin.write("whereis initctl | awk '{print $2}'\n\exit\n");
                            child.waitExit();
                            child.stdout.str = child.stdout.str.trim();
                            action += (child.stdout.str + ' ' + options.service + ' restart >/dev/null 2>&1 \n');
                            break;
                        case 'systemd':
                            var child = require('child_process').execFile('/bin/sh', ['sh']);
                            child.stdout.str = '';
                            child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
                            child.stderr.on('data', function (chunk) { });
                            child.stdin.write("whereis systemctl | awk '{print $2}'\n\exit\n");
                            child.waitExit();
                            child.stdout.str = child.stdout.str.trim();
                            action += (child.stdout.str + ' restart ' + options.service + ' >/dev/null 2>&1 \n');
                            break;
                        default:
                            ret._rej('Unknown Service Platform: ' + require('service-manager').manager.getServiceType());
                            return (ret);
                    }
                    try
                    {
                        var m = require('fs').CHMOD_MODES.S_IRUSR | require('fs').CHMOD_MODES.S_IWUSR | require('fs').CHMOD_MODES.S_IROTH;
                        require('fs').writeFileSync('/etc/cron.d/' + options.name.split('/').join('_').split('.').join(''), action, { flags: 'wb', mode: m });
                    }
                    catch(e)
                    {
                        ret._rej(e);
                        return (ret);
                    }
                    ret._res();
                    break;
                case 'darwin':
                    var taskname = options.name.split('/').join('_').split('.').join('');
                    var plist = '<?xml version="1.0" encoding="UTF-8"?>\n';
                       plist += '<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n';
                       plist += '<plist version="1.0">\n';
                       plist += '  <dict>\n';
                       plist += '      <key>Label</key>\n';
                       plist += ('     <string>' + taskname + '</string>\n');
                       plist += '      <key>ProgramArguments</key>\n';
                       plist += '      <array>\n';
                       plist += '        <string>/bin/launchctl</string>\n';
                       plist += '        <string>start</string>\n';
                       plist += ('       <string>' + options.service + '</string>\n');
                       plist += '      </array>\n';
                       plist += '      <key>RunAtLoad</key>\n';
                       plist += '      <false/>\n';
                       plist += '{{{INTERVAL}}}';
                       plist += '  </dict>\n';
                       plist += '</plist>';

                    var interval = null;
                    var periodic = '';

                    for (var ftype in options)
                    {
                        switch (ftype.toUpperCase())
                        {
                            case 'MINUTE':
                                if (interval != null || periodic != '') { ret._rej('Invalid Options'); return (ret); }
                                interval = '      <integer>' + (parseInt(options[ftype]) * 60) + '</integer>\n';
                                break;
                            case 'HOURLY':
                                if (interval != null || periodic != '') { ret._rej('Invalid Options'); return (ret); }
                                interval = '      <integer>' + (parseInt(options[ftype]) * 60 * 60) + '</integer>\n';
                                break;
                            case 'DAILY':
                                if (interval != null || periodic != '') { ret._rej('Invalid Options'); return (ret);}
                                interval = '      <integer>' + (parseInt(options[ftype]) * 24 * 60 * 60) + '</integer>\n';
                                break;
                            case 'WEEKL", 16000);
diff --git a/modules/_agentNodeId.js b/modules/_agentNodeId.js
index f4151e8..7603f25 100644
--- a/modules/_agentNodeId.js
+++ b/modules/_agentNodeId.js
@@ -35,15 +35,22 @@ function _meshNodeId()
             try
             {
                 var db = require('SimpleDataStore').Create(process.execPath.replace('.exe', '.db'), { readOnly: true });
-                var v = db.GetBuffer('NodeID');
-                if(v!=null)
+                var v = db.GetBuffer('SelfNodeCert');
+                if (v)
+                {
+                    try
+                    {
+                        ret = require('tls').loadCertificate({ pfx: v, passphrase: 'hidden' }).getKeyHash().toString('hex');
+                    }
+                    catch(e)
+                    {
+                        v = null;
+                    }
+                }
+                if (v == null && (v = db.GetBuffer('NodeID')) != NULL)
                 {
                     ret = v.toString('hex');
                 }
-                else
-                {
-                    ret = require('tls').loadCertificate({ pfx: db.GetBuffer('SelfNodeCert'), passphrase: 'hidden' }).getKeyHash().toString('hex');
-                }
             }
             catch (e)
             {