diff --git a/platformio/commands/serialports.py b/platformio/commands/serialports.py
index 33dea746..a620e254 100644
--- a/platformio/commands/serialports.py
+++ b/platformio/commands/serialports.py
@@ -7,6 +7,7 @@ import sys
 import click
 from serial.tools import miniterm
 
+from platformio import app
 from platformio.exception import PlatformioException
 from platformio.util import get_serialports
 
@@ -69,7 +70,7 @@ def serialports_list(json_output):
 @click.option("--quiet", is_flag=True,
               help="Diagnostics: suppress non-error messages, default=Off")
 def serialports_monitor(**kwargs):
-    sys.argv = sys.argv[2:]
+    sys.argv = app.get_session_var("command_ctx").args[1:]
 
     if not kwargs['port']:
         for item in get_serialports():
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index e43a3f56..2d178096 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -211,8 +211,8 @@ def on_command():
     if util.is_ci():
         measure_ci()
 
-    if app.get_session_var("calller_id"):
-        measure_caller(app.get_session_var("calller_id"))
+    if app.get_session_var("caller_id"):
+        measure_caller(app.get_session_var("caller_id"))
 
 
 def measure_ci():