diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 85531bd6c8791cc273c440451f794fe0a56bbebb..cea58f5cbbf54aa7ccb356fd40346b50891cdd95 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -52,12 +52,12 @@ js_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	scfg_t*		cfg;
 
 	if((cfg=(scfg_t*)JS_GetPrivate(cx,obj))==NULL)
-		return JS_FALSE;
+		return(JS_FALSE);
 
     for (i = 0; i < argc; i++) {
 		str = JS_ValueToString(cx, argv[i]);
 		if (!str)
-			return JS_FALSE;
+			return(JS_FALSE);
 		argv[i] = STRING_TO_JSVAL(str);
 		filename = JS_GetStringBytes(str);
 		errno = 0;
@@ -73,10 +73,11 @@ js_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 			JS_DestroyScript(cx, script);
 			}
 		if (!ok)
-			return JS_FALSE;
+			return(JS_FALSE);
     }
 
-    return JS_TRUE;
+	*rval=JSVAL_VOID;
+    return(JS_TRUE);
 }
 
 static JSBool
@@ -90,13 +91,13 @@ js_format(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
 	fmt = JS_ValueToString(cx, argv[0]);
 	if (!fmt)
-		return JS_FALSE;
+		return(JS_FALSE);
 
     for (i = 1; i < argc && i<sizeof(arglist)/sizeof(arglist[0]); i++) {
 		if(JSVAL_IS_STRING(argv[i])) {
 			str = JS_ValueToString(cx, argv[i]);
 			if (!str)
-			    return JS_FALSE;
+			    return(JS_FALSE);
 			arglist[i-1]=JS_GetStringBytes(str);
 		} else if(JSVAL_IS_INT(argv[i]) || JSVAL_IS_BOOLEAN(argv[i]))
 			arglist[i-1]=(char *)JSVAL_TO_INT(argv[i]);
@@ -111,8 +112,7 @@ js_format(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	JS_smprintf_free(p);
 
 	*rval = STRING_TO_JSVAL(str);
-
-    return JS_TRUE;
+    return(JS_TRUE);
 }
 
 static JSBool
@@ -124,6 +124,7 @@ js_mswait(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		val=JSVAL_TO_INT(argv[0]);
 	mswait(val);
 
+	*rval = JSVAL_VOID;
 	return(JS_TRUE);
 }
 
@@ -154,13 +155,14 @@ js_beep(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		dur=JSVAL_TO_INT(argv[1]);
 
 	sbbs_beep(freq,dur);
-
+	*rval = JSVAL_VOID;
 	return(JS_TRUE);
 }
 
 static JSBool
 js_exit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
+	*rval = JSVAL_VOID;
 	return(JS_FALSE);
 }
 
@@ -229,7 +231,7 @@ js_ascii(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 		if((p=JS_GetStringBytes(js_str))==NULL) 
 			return(JS_FALSE);
 
-		*rval = INT_TO_JSVAL(*p);
+		*rval=INT_TO_JSVAL(*p);
 		return(JS_TRUE);
 	}
 
@@ -238,9 +240,7 @@ js_ascii(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	str[1]=0;
 
 	js_str = JS_NewStringCopyZ(cx, str);
-
 	*rval = STRING_TO_JSVAL(js_str);
-
 	return(JS_TRUE);
 }
 
@@ -260,9 +260,7 @@ js_strip_ctrl(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 	strip_ctrl(p);
 
 	js_str = JS_NewStringCopyZ(cx, p);
-
 	*rval = STRING_TO_JSVAL(js_str);
-
 	return(JS_TRUE);
 }
 
diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c
index a1a74008e304f9815c372c28322dffca033b9cd3..2a653f31b3a79c3776da945f838b735349349e38 100644
--- a/src/sbbs3/js_socket.c
+++ b/src/sbbs3/js_socket.c
@@ -67,20 +67,20 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
 	if(argc)
 		type=JSVAL_TO_INT(argv[0]);
 
+	*rval = JSVAL_VOID;
+
 	if((sock=open_socket(type))==INVALID_SOCKET) {
 		dbprintf(TRUE, 0, "open_socket failed with error %d",ERROR_VALUE);
-		*rval = JSVAL_VOID;
-		return JS_FALSE;
+		return(JS_FALSE);
 	}
 
 	if(!JS_SetPrivate(cx, obj, (char*)(sock<<1))) {
 		dbprintf(TRUE, sock, "JS_SetPrivate failed");
-		*rval = JSVAL_VOID;
-		return JS_FALSE;
+		return(JS_FALSE);
 	}
 
 	dbprintf(FALSE, sock, "socket object constructed");
-	return JS_TRUE;
+	return(JS_TRUE);
 }
 
 /* Socket Destructor */
@@ -113,6 +113,8 @@ js_close(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	
 	sock=(uint)JS_GetPrivate(cx,obj)>>1;
 
+	*rval = JSVAL_VOID;
+
 	if(sock==INVALID_SOCKET || sock==0)
 		return(JS_TRUE);
 
@@ -145,12 +147,12 @@ js_bind(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	if((i=bind(sock, (struct sockaddr *) &addr, sizeof (addr)))!=0) {
 		dbprintf(TRUE, sock, "bind failed with error %d",ERROR_VALUE);
 		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
+		return(JS_TRUE);
 	}
 
 	dbprintf(FALSE, sock, "bound to port %u",addr.sin_port);
 	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	return JS_TRUE;
+	return(JS_TRUE);
 }
 
 static JSBool
@@ -166,13 +168,13 @@ js_connect(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	sock=(uint)JS_GetPrivate(cx,obj)>>1;
 
 	if(argc<2)
-		return JS_FALSE;
+		return(JS_FALSE);
 
 	str = JS_ValueToString(cx, argv[0]);
 	if((ip_addr=resolve_ip(JS_GetStringBytes(str)))==0) {
 		dbprintf(TRUE, sock, "resolve_ip failed with error %d",ERROR_VALUE);
 		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
+		return(JS_TRUE);
 	}
 
 	port = (ushort)JSVAL_TO_INT(argv[1]);
@@ -187,7 +189,7 @@ js_connect(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 	if((i=connect(sock, (struct sockaddr *)&addr, sizeof(addr)))!=0) {
 		dbprintf(TRUE, sock, "connect failed with error %d",ERROR_VALUE);
 		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
+		return(JS_TRUE);
 	}
 
 	*rval = BOOLEAN_TO_JSVAL(JS_TRUE);