diff --git a/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt b/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt
index bd6fd3e6f..4c35066df 100644
--- a/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt
+++ b/android-core/src/androidTest/kotlin/com.mparticle/networking/NetworkOptionsTest.kt
@@ -188,7 +188,7 @@ class NetworkOptionsTest : BaseCleanInstallEachTest() {
         )
     }
 
-    //  https://go.mparticle.com/work/SQDSDKS-6550
+    // https://go.mparticle.com/work/SQDSDKS-6613
     @Test
     @Throws(MalformedURLException::class)
     fun testRandomEndpoint_With_DomainMapping_And_DirectURL_Routing_true() {
diff --git a/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java b/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java
index bd935d45a..eb7a0cce4 100644
--- a/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java
+++ b/android-core/src/main/java/com/mparticle/networking/MParticleBaseClientImpl.java
@@ -108,7 +108,7 @@ protected MPUrl getUrl(Endpoint endpoint, @Nullable String identityPath, boolean
         String defaultDomain = url;
         boolean isDefaultDomain = true;
 
-        //Check if domain mapping is specified and update the URL based on domain mapping
+        // Check if domain mapping is specified and update the URL based on domain mapping
         String domainMappingUrl = domainMapping != null ? domainMapping.getUrl() : null;
         if (!MPUtility.isEmpty(domainMappingUrl)) {
             isDefaultDomain = url.equals(domainMappingUrl);
diff --git a/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java b/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java
index 7f5a8bbbb..b6ddb5c3d 100644
--- a/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java
+++ b/android-core/src/main/java/com/mparticle/networking/NetworkOptionsManager.java
@@ -69,6 +69,7 @@ static List<Certificate> getDefaultCertificates() {
         }
     };
 
+    // https://go.mparticle.com/work/SQDSDKS-6621
     static String getDefaultUrl(Endpoint type) {
         switch (type) {
             case CONFIG: