diff --git a/cmaclient.cpp b/cmaclient.cpp
index 164de00..269d42e 100644
--- a/cmaclient.cpp
+++ b/cmaclient.cpp
@@ -67,8 +67,6 @@ void CmaClient::enterEventLoop()
             break;
         }
 
-        qDebug("Event 0x%04X recieved", event.Code);
-
         switch(event.Code) {
         case PTP_EC_VITA_RequestSendNumOfObject:
             vitaEventSendNumOfObject(&event, event.Param1);
@@ -353,7 +351,7 @@ void CmaClient::vitaEventSendObjectMetadata(vita_event_t *event, int eventId)
 
     metadata_t *meta;
     int count = db->filterObjects(browse.ohfiParent, &meta);  // if meta is null, will return empty XML
-    qDebug("Sending %i metadata filtered objects for OHFI %id", count, browse.ohfiParent);
+    qDebug("Sending %i metadata filtered objects for OHFI %d", count, browse.ohfiParent);
 
     if(VitaMTP_SendObjectMetadata(device, eventId, meta) != PTP_RC_OK) {  // send all objects with OHFI parent
         qWarning("Sending metadata for OHFI parent %d failed", browse.ohfiParent);
@@ -433,6 +431,7 @@ void CmaClient::vitaEventCancelTask(vita_event_t *event, int eventId)
     int eventIdToCancel = event->Param2;
     VitaMTP_CancelTask(device, eventIdToCancel);
     qWarning("Event CancelTask (0x%x) unimplemented!", event->Code);
+    connected = false;
 }
 
 void CmaClient::vitaEventSendHttpObjectFromURL(vita_event_t *event, int eventId)
diff --git a/cmaobject.cpp b/cmaobject.cpp
index ed46505..bb83c6d 100644
--- a/cmaobject.cpp
+++ b/cmaobject.cpp
@@ -172,9 +172,7 @@ void CMAObject::initObject(const QFileInfo &file)
     metadata.name = strdup(file.fileName().toUtf8().data());
     metadata.ohfiParent = parent->metadata.ohfi;
     metadata.ohfi = ohfi_count++;
-    if(metadata.ohfi == 1494) {
-        metadata.ohfi = metadata.ohfi;
-    }
+
     metadata.type = VITA_DIR_TYPE_MASK_REGULAR; // ignored for files
     metadata.dateTimeCreated = file.created().toTime_t();
     metadata.size = file.size();
diff --git a/cmarootobject.cpp b/cmarootobject.cpp
index d5f92b8..999f8b7 100644
--- a/cmarootobject.cpp
+++ b/cmarootobject.cpp
@@ -34,6 +34,15 @@ void CMARootObject::initObject(const QString &path)
     metadata.type = VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_REGULAR;
 
     switch(root_ohfi) {
+        case VITA_OHFI_MUSIC:
+            metadata.dataType = Music;
+            this->path = path;
+            num_filters = 1;
+            filters = new metadata_t[1];
+            //createFilter(&filters[0], "Folders", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_PLAYLISTS);
+            createFilter(&filters[0], "All", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_SONGS);
+            break;
+
         case VITA_OHFI_PHOTO:
             metadata.dataType = Photo;
             this->path = path;
@@ -52,15 +61,6 @@ void CMARootObject::initObject(const QString &path)
             createFilter(&filters[1], "All", VITA_DIR_TYPE_MASK_VIDEO | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_ALL);
             break;
 
-        case VITA_OHFI_MUSIC:
-            metadata.dataType = Music;
-            this->path = path;
-            num_filters = 1;
-            filters = new metadata_t[1];
-            //createFilter(&filters[0], "Folders", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_PLAYLISTS);
-            createFilter(&filters[0], "All", VITA_DIR_TYPE_MASK_MUSIC | VITA_DIR_TYPE_MASK_ROOT | VITA_DIR_TYPE_MASK_SONGS);
-            break;
-
         case VITA_OHFI_VITAAPP:
             metadata.dataType = App;
             this->path = QDir(QDir(path).absoluteFilePath("APP")).absoluteFilePath(uuid);
diff --git a/main.cpp b/main.cpp
index 45c562e..3e48253 100644
--- a/main.cpp
+++ b/main.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
         qInstallMsgHandler(noMessageOutput);
 #endif
     } else {
-        VitaMTP_Set_Logging(VitaMTP_DEBUG);
+        VitaMTP_Set_Logging(VitaMTP_VERBOSE);
     }
 
     qDebug()<<"From main thread: "<<QThread::currentThreadId();
diff --git a/mainwidget.cpp b/mainwidget.cpp
index b50d1cd..714e01f 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -76,7 +76,8 @@ void MainWidget::refreshDatabase()
 {
     db.mutex.lock();
     db.destroy();
-    db.create();
+    int count = db.create();
+    qDebug("Indexed %i elements in the database", count);
     db.mutex.unlock();
 }