diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 48366d2c4..967e5a8bf 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -803,7 +803,7 @@ class AdminControllerCore extends Controller
 						if (empty($this->redirect_after))
 							$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=4&token='.$this->token;
 					}
-					Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id);
+					Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$object->id, true, (int)$this->context->employee->id);
 				}
 				else
 					$this->errors[] = Tools::displayError('An error occurred while updating an object.').
@@ -3013,4 +3013,4 @@ class AdminControllerCore extends Controller
 
 		return $return;
 	}
-}
\ No newline at end of file
+}
diff --git a/classes/db/DbPDO.php b/classes/db/DbPDO.php
index 2e267e0a4..ab5d1ede8 100644
--- a/classes/db/DbPDO.php
+++ b/classes/db/DbPDO.php
@@ -25,8 +25,6 @@
 */
 
 /**
- * This class is currently only here for tests
- *
  * @since 1.5.0
  */
 class DbPDOCore extends Db
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 22694773d..8791cd27f 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -375,6 +375,7 @@ class AdminImagesControllerCore extends AdminController
 					|| !Configuration::updateValue('PS_PNG_QUALITY', Tools::getValue('PS_PNG_QUALITY')))
 					$this->errors[] = Tools::displayError('Unknown error.');
 				else
+					$this->confirmations[] = $this->_conf[6];
 					return parent::postProcess();
 			}
 			else
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index b1e630bc1..0f23f90d3 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -511,7 +511,7 @@ class AdminManufacturersControllerCore extends AdminController
 		$this->fields_value = array(
 			'name' => Manufacturer::getNameById($address->id_manufacturer),
 			'alias' => 'manufacturer',
-			'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
+			'id_country' => $address->id_country
 		);
 
 		$this->initToolbar();
@@ -671,6 +671,8 @@ class AdminManufacturersControllerCore extends AdminController
 
 		if (Tools::isSubmit('editaddresses'))
 			$this->display = 'editaddresses';
+		else if (Tools::isSubmit('updateaddress'))
+			$this->display = 'editaddresses';
 		else if (Tools::isSubmit('addaddress'))
 			$this->display = 'addaddress';
 		else if (Tools::isSubmit('submitAddaddress'))