diff --git a/src/Database.cpp b/src/Database.cpp
index 5c306c8..c87fd32 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -60,7 +60,7 @@ void KpxUuid::toRaw(void* dst)const{
 }
 
 void KpxUuid::fromRaw(const void* src){
-	Data.replace(0,16,(char*)src);
+	Data=QByteArray((char*)src,16);
 }
 
 bool KpxUuid::operator==(const KpxUuid& other)const{
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 3b6be83..5c519c4 100644
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -220,7 +220,6 @@ void CEditEntryDlg::OnButtonOK()
 	}
 	// MX-COMMENT: Should not this line go inside the if(Modflag) block?
 	entry->setImage(IconIndex);
-	entry->setOldImage(IconIndex);
 
 	if(ModFlag&&EntryMoved)done(2);
 	else if(ModFlag)done(1);