diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index 9a34cd180b..f4a6bb5923 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -234,10 +234,16 @@ switch (toLower _mode) do {
                 //[_show] call FUNC(handleMap);
             };
             case 57: { // Spacebar
+                // Freecam attachment here, if in external then set cam pos and attach
+            };
+            case 200: { // Up arrow
                 [[2,0,1] select GVAR(camMode)] call FUNC(updateCamera);
             };
             case 203: { // Left arrow
 
+            };
+            case 204: { // Down arrow
+                [[1,2,0] select GVAR(camMode)] call FUNC(updateCamera);
             };
             case 205: { // Right arrow
 
diff --git a/addons/spectator/functions/fnc_updateUnits.sqf b/addons/spectator/functions/fnc_updateUnits.sqf
index 0f3b244d19..b62c8dd6b4 100644
--- a/addons/spectator/functions/fnc_updateUnits.sqf
+++ b/addons/spectator/functions/fnc_updateUnits.sqf
@@ -61,7 +61,7 @@ if (GVAR(filterSides) == 0) then {
         (alive _x) &&
         {(_x isKindOf "CAManBase")} &&
         {(side _x) in _sides} && // Side filter
-        {simulationEnabled _x}
+        {simulationEnabled _x} &&
         {!(_x getVariable [QGVAR(isSpectator), false])} // Who watches the watchmen?
     ) then {
         GVAR(unitList) pushBack _x;