diff --git a/src/gs-entbase/client/prop_rope.qc b/src/gs-entbase/client/prop_rope.qc
index 602466e1..e3d8c8c2 100644
--- a/src/gs-entbase/client/prop_rope.qc
+++ b/src/gs-entbase/client/prop_rope.qc
@@ -166,6 +166,7 @@ prop_rope::predraw(void)
 		vector lit2 = /*[0.1,0.1,0.1] */ getlight(pos2) / 255;
 
 		makevectors(getproperty(VF_CL_VIEWANGLES));
+		setproperty(VF_ORIGIN, vecPlayer);
 		R_BeginPolygon(m_strShader, 0, 0);
 			R_PolygonVertex(pos1, [0,0], lit1, 1.0f);
 			R_PolygonVertex(pos2, [0,1], lit2, 1.0f);
@@ -195,10 +196,11 @@ prop_rope::predraw(void)
 #ifndef ROPE_RIBBON
 		draw_segment(pos1, pos2, 0);
 #else
-		vector lit1 = /*[0.1,0.1,0.1] */ getlight(pos1) / 255;
-		vector lit2 = /*[0.1,0.1,0.1] */ getlight(pos2) / 255;
+		vector lit1 = getlight(pos1) / 255;
+		vector lit2 = getlight(pos2) / 255;
 
 		makevectors(getproperty(VF_CL_VIEWANGLES));
+		setproperty(VF_ORIGIN, vecPlayer);
 		R_BeginPolygon(m_strShader, 0, 0);
 			R_PolygonVertex(pos1, [0,0], lit1, 1.0f);
 			R_PolygonVertex(pos2, [0,1], lit2, 1.0f);
diff --git a/src/gs-entbase/shared/NSTrigger.h b/src/gs-entbase/shared/NSTrigger.h
index d7003bd4..79658383 100644
--- a/src/gs-entbase/shared/NSTrigger.h
+++ b/src/gs-entbase/shared/NSTrigger.h
@@ -47,11 +47,10 @@ class NSTrigger:NSIO
 	virtual int(void) GetMaster;
 
 	/* overrides */
-	virtual void(string, string) SpawnKey;
 	virtual void(float) Save;
 	virtual void(string,string) Restore;
-	
 #endif
+	virtual void(string, string) SpawnKey;
 };
 
 enum
diff --git a/src/gs-entbase/shared/NSTrigger.qc b/src/gs-entbase/shared/NSTrigger.qc
index 8c83e7af..c1e8b4bb 100644
--- a/src/gs-entbase/shared/NSTrigger.qc
+++ b/src/gs-entbase/shared/NSTrigger.qc
@@ -141,6 +141,7 @@ NSTrigger::Restore(string strKey, string strValue)
 		super::Restore(strKey, strValue);
 	}
 }
+#endif
 
 void
 NSTrigger::SpawnKey(string strKey, string strValue)
@@ -149,6 +150,7 @@ NSTrigger::SpawnKey(string strKey, string strValue)
 	case "target":
 		target = strValue;
 		break;
+#ifdef SERVER
 	case "killtarget":
 		m_strKillTarget = strValue;
 		break;
@@ -164,12 +166,12 @@ NSTrigger::SpawnKey(string strKey, string strValue)
 	case "delay":
 		m_flDelay = stof(strValue);
 		break;
+#endif
 	default:
 		NSIO::SpawnKey(strKey, strValue);
 		break;
 	}
 }
-#endif
 
 void
 NSTrigger::NSTrigger(void)