diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
index 01438bf66..cad0d36bd 100644
--- a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -451,6 +451,7 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer implements Statements
                 if ($function_param->type
                     && $function_param->type_location
                     && $function_param->type_location !== $function_param->signature_type_location
+                    && $function_param->type_location->file_path === $this->getFilePath()
                 ) {
                     $replace_type = ExpressionAnalyzer::fleshOutType(
                         $codebase,
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
index e503e7663..8eccbe8b0 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -867,7 +867,10 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
                                         $new_method_name
                                     );
 
-                                    FileManipulationBuffer::add($statements_analyzer->getFilePath(), $file_manipulations);
+                                    FileManipulationBuffer::add(
+                                        $statements_analyzer->getFilePath(),
+                                        $file_manipulations
+                                    );
 
                                     $moved_call = true;
                                 }
diff --git a/src/psalm-refactor.php b/src/psalm-refactor.php
index 4ff170cfe..75d025eaf 100644
--- a/src/psalm-refactor.php
+++ b/src/psalm-refactor.php
@@ -11,7 +11,7 @@ use Psalm\Progress\DefaultProgress;
 error_reporting(-1);
 ini_set('display_errors', '1');
 ini_set('display_startup_errors', '1');
-ini_set('memory_limit', '4096M');
+ini_set('memory_limit', '8192M');
 
 gc_collect_cycles();
 gc_disable();