diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon
index de9931efa55..90bbe88e778 100644
--- a/.github/phpstan-baseline.neon
+++ b/.github/phpstan-baseline.neon
@@ -1000,11 +1000,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
 
-		-
-			message: "#^Return type \\(array\\) of method Mage_Api_Model_Wsdl_Config_Element\\:\\:getChildren\\(\\) should be compatible with return type \\(RecursiveIterator\\|null\\) of method RecursiveIterator\\<string,static\\(SimpleXMLElement\\)\\>\\:\\:getChildren\\(\\)$#"
-			count: 1
-			path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
-
 		-
 			message: "#^Return type \\(void\\) of method Mage_Api2_Block_Adminhtml_Attribute_Grid\\:\\:_prepareCollection\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareCollection\\(\\)$#"
 			count: 1
@@ -1955,11 +1950,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php
 
-		-
-			message: "#^Binary operation \"\\*\" between string and 1024 results in an error\\.$#"
-			count: 3
-			path: ../app/code/core/Mage/Catalog/Model/Product/Image.php
-
 		-
 			message: "#^Cannot call method isIndexable\\(\\) on Mage_Eav_Model_Entity_Attribute_Abstract\\|false\\.$#"
 			count: 1
@@ -3081,7 +3071,7 @@ parameters:
 			path: ../app/code/core/Mage/Core/Model/Resource/Setup.php
 
 		-
-			message: "#^Binary operation \"\\.\" between string and array results in an error\\.$#"
+			message: "#^Binary operation \"\\.\" between \\(string\\|false\\) and array results in an error\\.$#"
 			count: 1
 			path: ../app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php
 
@@ -4260,16 +4250,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Log/Model/Resource/Log.php
 
-		-
-			message: "#^Method Mage_Media_Model_File_Image\\:\\:getImage\\(\\) should return bool\\|resource but returns GdImage\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Media/Model/File/Image.php
-
-		-
-			message: "#^Method Mage_Media_Model_File_Image\\:\\:getTmpImage\\(\\) should return resource but returns GdImage\\|false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Media/Model/File/Image.php
-
 		-
 			message: "#^Property Mage_Media_Model_Image\\:\\:\\$_image \\(resource\\) does not accept null\\.$#"
 			count: 1
@@ -4416,7 +4396,7 @@ parameters:
 			path: ../app/code/core/Mage/Payment/Model/Method/Abstract.php
 
 		-
-			message: "#^Binary operation \"\\*\\=\" between string and 2 results in an error\\.$#"
+			message: "#^Binary operation \"\\-\" between string and int\\<\\-9, 9\\> results in an error\\.$#"
 			count: 1
 			path: ../app/code/core/Mage/Payment/Model/Method/Cc.php
 
@@ -5755,26 +5735,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php
 
-		-
-			message: "#^Binary operation \"\\*\" between string and 1024 results in an error\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Uploader/Helper/File.php
-
-		-
-			message: "#^Binary operation \"\\*\" between string and 1048576 results in an error\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Uploader/Helper/File.php
-
-		-
-			message: "#^Binary operation \"\\*\" between string and 1073741824 results in an error\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Uploader/Helper/File.php
-
-		-
-			message: "#^Binary operation \"\\*\" between string and 1099511627776 results in an error\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Uploader/Helper/File.php
-
 		-
 			message: "#^Method Mage_Widget_Block_Adminhtml_Widget_Chooser\\:\\:getConfig\\(\\) should return Varien_Object but returns mixed\\.$#"
 			count: 2
diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
index a8bfde411e1..c8e248b7ee4 100644
--- a/app/code/core/Mage/Customer/Block/Form/Register.php
+++ b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -121,11 +121,11 @@ public function getCountryId()
      */
     public function getRegion()
     {
-        if ($region = $this->getFormData()->getRegion() !== false) {
+        if (($region = $this->getFormData()->getRegion()) !== false) {
             return $region;
         }
 
-        if ($region = $this->getFormData()->getRegionId() !== false) {
+        if (($region = $this->getFormData()->getRegionId()) !== false) {
             return $region;
         }
         return null;