diff --git a/selfdrive/common/swaglog.cc b/selfdrive/common/swaglog.cc
index cde768c8e..b9b5ae6d8 100644
--- a/selfdrive/common/swaglog.cc
+++ b/selfdrive/common/swaglog.cc
@@ -66,7 +66,8 @@ class SwaglogState : public LogState {
 
 static SwaglogState s = {};
 
-static void set_frame_id(uint32_t frame_id){
+
+void set_frame_id(uint32_t frame_id){
   s.ctx_j["frame_id"] = std::to_string(frame_id).c_str();
 }
 
diff --git a/selfdrive/common/swaglog.h b/selfdrive/common/swaglog.h
index 11c2c0c6c..6b353dffb 100644
--- a/selfdrive/common/swaglog.h
+++ b/selfdrive/common/swaglog.h
@@ -14,6 +14,7 @@
 void cloudlog_e(int levelnum, const char* filename, int lineno, const char* func,
                 const char* fmt, ...) /*__attribute__ ((format (printf, 6, 7)))*/;
 
+void set_frame_id(uint32_t frame_id);
 
 #define cloudlog(lvl, fmt, ...) cloudlog_e(lvl, __FILE__, __LINE__, \
                                            __func__, \
@@ -22,14 +23,14 @@ void cloudlog_e(int levelnum, const char* filename, int lineno, const char* func
 #define cloudlog_t_translate(lvl, event_name, translate,...)                                 \
 {                                                                 \
   uint64_t ns = nanos_since_boot();                               \
-  std::string json_msg = std::string("{'timestamp': {'event': '") + std::string(event_name) + std::string(",'time':") + std::to_string(ns)+ std::string(",'translate':") + std::to_string(translate)+std::string("}}");   \
+  std::string json_msg = std::string("{'timestamp': {'event': '") + std::string(event_name) + std::string("','time':") + std::to_string(ns)+ std::string(",'translate':") + std::to_string(translate)+std::string("}}");   \
   cloudlog(lvl, json_msg.c_str(), ## __VA_ARGS__);                             \
 }
 
 #define cloudlog_t(lvl, event_name,...)                                 \
 {                                                                 \
   uint64_t ns = nanos_since_boot();                               \
-  std::string json_msg = std::string("{'timestamp': {'event': '") + std::string(event_name)+ std::string(",'time':") + std::to_string(ns)+ std::string(",'translate':") + std::string("false")+std::string("}}");   \
+  std::string json_msg = std::string("{'timestamp': {'event': '") + std::string(event_name)+ std::string("','time':") + std::to_string(ns)+ std::string(",'translate':") + std::string("false")+std::string("}}");   \
   cloudlog(lvl, json_msg.c_str(), ## __VA_ARGS__);                             \
 }
 
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
index d1b2f1788..728331b8f 100755
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@@ -735,7 +735,7 @@ class Controls:
     # Sample data from sockets and get a carState
     CS = self.data_sample()
     #os.environ["FRAME_ID"] = str(self.sm['lateralPlan'].frameId)
-    cloudlog.bind(frame_id=sm['lateralPlan'].frameId)
+    cloudlog.bind(frame_id=self.sm['lateralPlan'].frameId)
     cloudlog.timestamp("Data sampled")
     self.prof.checkpoint("Sample")