diff --git a/src/sbbs3/file.cpp b/src/sbbs3/file.cpp
index 9d463abe6081b8d4df49f34fa5f4d651fc620bab..165692aa525e5166add4b6cc974c5aeedf390059 100644
--- a/src/sbbs3/file.cpp
+++ b/src/sbbs3/file.cpp
@@ -281,7 +281,7 @@ bool sbbs_t::checkfname(char *fname)
 	if(fname[0]=='-'
 		|| strcspn(fname,ILLEGAL_FILENAME_CHARS)!=strlen(fname)) {
 		lprintf(LOG_WARNING,"Suspicious filename attempt: '%s'",fname);
-		hacklog("Filename", fname);
+		hacklog((char *)"Filename", fname);
 		return(false); 
 	}
 	if(strstr(fname,".."))
diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp
index 75275ef0d3ad824e7938002ce3e56ad467aa61df..1ce7d47744c973e25191835e7a78d29e5490c201 100644
--- a/src/sbbs3/js_bbs.cpp
+++ b/src/sbbs3/js_bbs.cpp
@@ -3481,15 +3481,19 @@ static JSBool js_bbs_resolve(JSContext *cx, JSObject *obj, jsid id)
 {
 	char*			name=NULL;
 
-	if(id != JSVAL_NULL)
-		name=JS_GetStringBytes(JSVAL_TO_STRING(id));
+	if(id != JSID_VOID && id != JSID_EMPTY) {
+		jsval idval;
+		
+		JS_IdToValue(cx, id, &idval);
+		name=JS_GetStringBytes(JSVAL_TO_STRING(idval));
+	}
 
 	return(js_SyncResolve(cx, obj, name, js_bbs_properties, js_bbs_functions, NULL, 0));
 }
 
 static JSBool js_bbs_enumerate(JSContext *cx, JSObject *obj)
 {
-	return(js_bbs_resolve(cx, obj, JSVAL_NULL));
+	return(js_bbs_resolve(cx, obj, JSID_VOID));
 }
 
 static JSClass js_bbs_class = {
diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp
index 1ebba2f9c8169d3764e5c185e727839d173dd3af..43ab34d0673fd03ca872bca2544d09de83f43569 100644
--- a/src/sbbs3/js_console.cpp
+++ b/src/sbbs3/js_console.cpp
@@ -1762,15 +1762,19 @@ static JSBool js_console_resolve(JSContext *cx, JSObject *obj, jsid id)
 {
 	char*			name=NULL;
 
-	if(id != JSVAL_NULL)
-		name=JS_GetStringBytes(JSVAL_TO_STRING(id));
+	if(id != JSID_VOID && id != JSID_EMPTY) {
+		jsval idval;
+		
+		JS_IdToValue(cx, id, &idval);
+		name=JS_GetStringBytes(JSVAL_TO_STRING(idval));
+	}
 
 	return(js_SyncResolve(cx, obj, name, js_console_properties, js_console_functions, NULL, 0));
 }
 
 static JSBool js_console_enumerate(JSContext *cx, JSObject *obj)
 {
-	return(js_console_resolve(cx, obj, JSVAL_NULL));
+	return(js_console_resolve(cx, obj, JSID_VOID));
 }
 
 static JSClass js_console_class = {