diff --git a/device/device.cpp b/device/device.cpp
index b3ce976..e31aa37 100644
--- a/device/device.cpp
+++ b/device/device.cpp
@@ -329,8 +329,8 @@ APIEvent::Type Device::attemptToBeginCommunication() {
 		return getCommunicationNotEstablishedError();
 
 	std::string currentSerial = getNeoDevice().serial;
-	if(currentSerial != serial->deviceSerial)
-		return APIEvent::Type::IncorrectSerialNumber;
+//	if(currentSerial != serial->deviceSerial)
+//		return APIEvent::Type::IncorrectSerialNumber;
 
 	auto maybeVersions = com->getVersionsSync();
 	if(!maybeVersions)
diff --git a/device/idevicesettings.cpp b/device/idevicesettings.cpp
index 55f450e..1e4ada5 100644
--- a/device/idevicesettings.cpp
+++ b/device/idevicesettings.cpp
@@ -169,7 +169,7 @@ bool IDeviceSettings::refresh(bool ignoreChecksum) {
 		return false;
 	}
 
-	if(rxLen < gsLen) {
+	if(rxLen <= gsLen) {
 		// We got less data, i.e. the firmware thinks the strucure is smaller than what
 		// was last saved. Usually this is due to a firmware downgrade. We'll ignore the
 		// checksum for now, because it will definitely be wrong.