diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index b27067b8c..00aa399d6 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -905,7 +905,7 @@ class Context
 	 * Return string accoring to the inputed code
 	 *
 	 * @param string $code Language variable name
-	 * @return string If string for the code exists returns it, otherwise returns original code
+	 * @return mixed
 	 */
 	public static function getLang($code)
 	{
@@ -1022,7 +1022,7 @@ class Context
 	 * @param string $key
 	 * @param mixed $charset charset
 	 * @see arrayConvWalkCallback will replaced array_walk_recursive in >=PHP5
-	 * @return void
+	 * @return ?bool
 	 */
 	public static function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
@@ -1051,7 +1051,7 @@ class Context
 	 * @param string $key
 	 * @param string $charset character set
 	 * @see arrayConvWalkCallback will replaced array_walk_recursive in >=PHP5
-	 * @return object converted object
+	 * @return void
 	 */
 	public static function doConvertEncoding(&$val, $key = null, $charset = 'CP949')
 	{
@@ -1317,7 +1317,7 @@ class Context
 	 *
 	 * @return void
 	 */
-	private static function setUploadInfo()
+	public static function setUploadInfo()
 	{
 		if (!isset($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] !== 'POST' || !$_FILES)
 		{
@@ -1619,10 +1619,12 @@ class Context
 	}
 
 	/**
-	 * Display a generic error page and exit.
+	 * Display a generic error page.
 	 *
 	 * @param string $title
 	 * @param string $message
+	 * @param int $status
+	 * @param string $location
 	 * @return void
 	 */
 	public static function displayErrorPage($title = 'Error', $message = '', $status = 500, $location = '')
@@ -1965,7 +1967,7 @@ class Context
 	 *
 	 * @param string $key Key
 	 * @param mixed $val Value
-	 * @param mixed $replace_request_arg
+	 * @param bool $replace_request_arg
 	 * @return void
 	 */
 	public static function set($key, $val, $replace_request_arg = false)