diff --git a/build/mobile/devicemanager.py b/build/mobile/devicemanager.py
index 36f7e36a1df9..712fcb304bbb 100644
--- a/build/mobile/devicemanager.py
+++ b/build/mobile/devicemanager.py
@@ -166,6 +166,7 @@ class DeviceManager:
         # TODO: We had an old sleep here but we don't need it
 
         while (found == False and (loopguard < recvGuard)):
+          temp = ''
           if (self.debug >= 4): print "recv'ing..."
 
           # Get our response
@@ -193,8 +194,9 @@ class DeviceManager:
 
           # If we violently lose the connection to the device, this loop tends to spin,
           # this guard prevents that
-          loopguard = loopguard + 1
-
+          if (temp == ''):
+            loopguard += 1
+            
     # TODO: We had an old sleep here but we don't need it
     if (shouldCloseSocket == True):
       try:
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index b08b24fc9a6f..741875028a81 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -125,7 +125,10 @@ class RemoteOptions(MochitestOptions):
             return None
 
         if (options.remoteLogFile == None):
-            options.remoteLogFile =  automation._devicemanager.getDeviceRoot() + '/test.log'
+            options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/test.log'
+
+        if (options.remoteLogFile.count('/') < 1):
+            options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/' + options.remoteLogFile
 
         # Set up our options that we depend on based on the above
         productRoot = options.remoteTestRoot + "/" + automation._product
@@ -286,6 +289,7 @@ def main():
     if (options == None):
         sys.exit(1)
     
+    auto.setRemoteLog(options.remoteLogFile)
     auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)
     sys.exit(mochitest.runTests(options))