diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 0b9a52cdf0e..6f3ac2cdf0f 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -444,7 +444,7 @@ function dolWebsiteIncrementCounter($websiteid, $websitepagetype, $websitepageid
 			$sql .= " pageviews_total = pageviews_total + 1,";
 			$sql .= " pageviews_month = pageviews_month + 1,";
 			// if last access was done during previous month, we save pageview_month into pageviews_previous_month
-			$sql .= " pageviews_previous_month = ".$db->ifsql("lastaccess < '".$db->idate(dol_mktime(0, 0, 0, $tmpnow['month'], 1, $tmpnow['year'], 'gmt', 0), 'gmt')."'", 'pageviews_month', 'pageviews_previous_month').",";
+			$sql .= " pageviews_previous_month = ".$db->ifsql("lastaccess < '".$db->idate(dol_mktime(0, 0, 0, $tmpnow['mon'], 1, $tmpnow['year'], 'gmt', 0), 'gmt')."'", 'pageviews_month', 'pageviews_previous_month').",";
 			$sql .= " lastaccess = '".$db->idate(dol_now('gmt'), 'gmt')."'";
 			$sql .= " WHERE rowid = ".((int) $websiteid);
 			$resql = $db->query($sql);
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index d9fe10c8868..769f8edd8a4 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -51,7 +51,7 @@ if (!is_object($website)) {
 	$website->fetch(0, $websitekey);
 }
 // Define $websitepage if we have $websitepagefile defined
-if (!$pageid && !empty($websitepagefile)) {
+if (empty($pageid) && !empty($websitepagefile)) {
 	$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
 	if ($pageid == 'index.php') {
 		$pageid = $website->fk_default_home;
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 718e3043a23..46c902238de 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -375,7 +375,7 @@ if ($mode != 'future') {
 	print img_picto('', 'stock', 'class="pictofixedwidth"').$langs->trans("Warehouse").' :';
 	print '</span> ';
 	$selected = ((GETPOSTISSET('search_fk_warehouse') || GETPOSTISSET('fk_warehouse')) ? $search_fk_warehouse : 'ifonenodefault');
-	print $formproduct->selectWarehouses($selected, 'search_fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref', 1);
+	print $formproduct->selectWarehouses($selected, 'search_fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, 'minwidth200', null, 1, false, 'e.ref', 1);
 }
 
 print '</div>';