diff --git a/modules/Calendar/views/TaskManagement.php b/modules/Calendar/views/TaskManagement.php
index f931896fd848bbe421d0858e5ec390df4ebba858..d9c154120d9376d09a25a5bc626e2de5ca280bfb 100644
--- a/modules/Calendar/views/TaskManagement.php
+++ b/modules/Calendar/views/TaskManagement.php
@@ -117,8 +117,7 @@ class Calendar_TaskManagement_View extends Vtiger_Index_View {
 				$color = $db->query_result($result,$i,'color');
 			}
 		}
-		if(($color=='#ffffff') || ($color==' '))
-		{
+		if($color=='#ffffff' || empty($color)) {
 			$color = '#'.dechex(rand(0x000000, 0xFFFFFF));
 		}
 		return $color;
diff --git a/modules/Settings/Vtiger/models/ConfigModule.php b/modules/Settings/Vtiger/models/ConfigModule.php
index 09c10b560c2558d7c6df1d3e1175964df057420b..47ea1dacef4b2e69944ca5b51190f5cd1717f2c3 100644
--- a/modules/Settings/Vtiger/models/ConfigModule.php
+++ b/modules/Settings/Vtiger/models/ConfigModule.php
@@ -153,7 +153,7 @@ class Settings_Vtiger_ConfigModule_Model extends Settings_Vtiger_Module_Model {
 			return "LBL_INVALID_EMAILID";
 		} else if(array_key_exists('HELPDESK_SUPPORT_NAME',$updatedFields) && preg_match ('/[\'";?><]/', $updatedFields['HELPDESK_SUPPORT_NAME'])) {
 			return "LBL_INVALID_SUPPORT_NAME";
-                } else if((array_key_exists('upload_maxsize',$updatedFields) && !filter_var(ltrim($updatedFields['upload_maxsize'],'0'), FILTER_VALIDATE_INT)) || (array_key_exists('list_max_entries_per_page',$updatedFields) &&  filter_var(ltrim($updatedFields['list_max_entries_per_page'], '0'), FILTER_VALIDATE_INT, array("options" => array("min_range"=>1, "max_range"=>100))) === false) || (array_key_exists('listview_max_textlength',$updatedFields) && filter_var(ltrim($updatedFields['listview_max_textlength'], '0'), FILTER_VALIDATE_INT , array("options" => array("min_range"=>1, "max_range"=>100))) === false)){
+                } else if((array_key_exists('upload_maxsize',$updatedFields) &&  filter_var(ltrim($updatedFields['upload_maxsize'], '0'), FILTER_VALIDATE_INT, array("options" => array("min_range"=>1, "max_range"=>5))) === false) || (array_key_exists('list_max_entries_per_page',$updatedFields) &&  filter_var(ltrim($updatedFields['list_max_entries_per_page'], '0'), FILTER_VALIDATE_INT, array("options" => array("min_range"=>1, "max_range"=>100))) === false) || (array_key_exists('listview_max_textlength',$updatedFields) && filter_var(ltrim($updatedFields['listview_max_textlength'], '0'), FILTER_VALIDATE_INT , array("options" => array("min_range"=>1, "max_range"=>100))) === false)){
 			return "LBL_INVALID_NUMBER";
 		}
 		return true;