diff --git a/src/cmaclient.cpp b/src/cmaclient.cpp
index 252737c..a8b195d 100644
--- a/src/cmaclient.cpp
+++ b/src/cmaclient.cpp
@@ -92,13 +92,15 @@ void CmaClient::connectWireless()
 
     setActive(true);
 
-    broadcast = new CmaBroadcast(this);
+    CmaBroadcast *broadcast = new CmaBroadcast(this);
 
     do {
         qDebug("Waiting for wireless connection");
         if((vita = VitaMTP_Get_First_Wireless_Vita(&host, 0, CC::deviceRegistered, CC::generatePin, CC::registrationComplete)) != NULL) {
             qDebug("Starting new wireless connection");
+            broadcast->setUnavailable();
             processNewConnection(vita);
+            broadcast->setAvailable();
         } else {
             mutex.lock();
             if(in_progress) {
@@ -124,7 +126,6 @@ void CmaClient::processNewConnection(vita_device_t *device)
 {
     QMutexLocker locker(&mutex);
     in_progress = true;
-    broadcast->setUnavailable();
 
     qDebug("Vita connected: id %s", VitaMTP_Get_Identification(device));
     DeviceCapability vita_info;
@@ -156,7 +157,6 @@ void CmaClient::processNewConnection(vita_device_t *device)
 
     emit deviceDisconnected();
 
-    broadcast->setAvailable();
     in_progress = false;
     sema.release();
 }
diff --git a/src/cmaclient.h b/src/cmaclient.h
index c9d13c6..e6c4a47 100644
--- a/src/cmaclient.h
+++ b/src/cmaclient.h
@@ -54,7 +54,6 @@ private:
     static int cancelCallback();
     static void registrationComplete();
 
-    CmaBroadcast *broadcast;
     Database *m_db;
     static QString tempOnlineId;
 
diff --git a/src/qlistdb.cpp b/src/qlistdb.cpp
index 2da853c..c79383a 100644
--- a/src/qlistdb.cpp
+++ b/src/qlistdb.cpp
@@ -213,7 +213,7 @@ int QListDB::recursiveScanRootDirectory(root_list &list, CMAObject *parent, int
 
     QDir dir(parent->path);
     dir.setSorting(QDir::Name | QDir::DirsFirst);
-    QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+    QFileInfoList qsl = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot, QDir::Time);
 
     foreach(const QFileInfo &info, qsl) {