diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 9b3c8071d..c25e52a74 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -153,7 +153,7 @@ class TemplateHandler
 			$error_message = vsprintf('Template not found: %s%s%s', array(
 				$tpl_path,
 				preg_replace('/\.html$/i', '', $tpl_filename) . '.html',
-				$tpl_file ? " (${tpl_file})" : '',
+				$tpl_file ? " ($tpl_file)" : '',
 			));
 			trigger_error($error_message, \E_USER_WARNING);
 			return escape($error_message);
diff --git a/modules/admin/controllers/ServerEnv.php b/modules/admin/controllers/ServerEnv.php
index f654351c6..4c13ba789 100644
--- a/modules/admin/controllers/ServerEnv.php
+++ b/modules/admin/controllers/ServerEnv.php
@@ -225,7 +225,7 @@ class ServerEnv extends Base
 		{
 			if (is_array($value))
 			{
-				$value = implode(', ', $value) ?: "no additional ${key}s";
+				$value = implode(', ', $value) ?: "no additional {$key}s";
 			}
 			
 			if (is_int($key) || ctype_digit($key))
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index ebece2959..9fdc63497 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -127,16 +127,20 @@ class FileAdminView extends File
 					}
 				}
 
-				if($file->upload_target_type && isset(${$file->upload_target_type.'_srls'}) && is_array(${$file->upload_target_type.'_srls'}))
+				if (in_array($file->upload_target_type, ['doc', 'com']))
 				{
-					if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
+					$var = $file->upload_target_type . '_srls';
+					if (!in_array($target_srl, $$var))
 					{
-						${$file->upload_target_type.'_srls'}[] = $target_srl;
+						$$var[] = $target_srl;
 					}
 				}
+				if (!in_array($file->module_srl, $mod_srls))
+				{
+					$mod_srls[] = $file->module_srl;
+				}
 
 				$file_list[$file_srl] = $file;
-				$mod_srls[] = $file->module_srl;
 			}
 			// Remove duplication
 			$doc_srls = array_unique($doc_srls);