diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index a62d1af42..0c1809b1a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -32,8 +32,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import java.util.WeakHashMap;
 import java.util.Map.Entry;
+import java.util.WeakHashMap;
 import java.util.concurrent.Callable;
 
 import org.apache.commons.lang.StringUtils;
@@ -45,15 +45,15 @@ import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations;
 import org.navalplanner.business.planner.entities.AssignmentFunction;
+import org.navalplanner.business.planner.entities.AssignmentFunction.ASSIGNMENT_FUNCTION_NAME;
 import org.navalplanner.business.planner.entities.CalculatedValue;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
 import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SigmoidFunction;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
+import org.navalplanner.business.planner.entities.StretchesFunction.Type;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.business.planner.entities.AssignmentFunction.ASSIGNMENT_FUNCTION_NAME;
-import org.navalplanner.business.planner.entities.StretchesFunction.Type;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
@@ -66,8 +66,8 @@ import org.zkoss.ganttz.timetracker.PairOfLists;
 import org.zkoss.ganttz.timetracker.TimeTrackedTable;
 import org.zkoss.ganttz.timetracker.TimeTrackedTableWithLeftPane;
 import org.zkoss.ganttz.timetracker.TimeTracker;
-import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.TimeTracker.IDetailItemFilter;
+import org.zkoss.ganttz.timetracker.TimeTrackerComponentWithoutColumns;
 import org.zkoss.ganttz.timetracker.zoom.DetailItem;
 import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@@ -531,8 +531,9 @@ public class AdvancedAllocationController extends GenericForwardComposer {
                     paginatorStart = paginatorStart.plus(intervalIncrease());
                 }
                 paginatorEnd = paginatorStart.plus(intervalIncrease());
-                if ((paginatorEnd.plus(intervalIncrease()).isAfter(intervalEnd))) {
-                    paginatorEnd = paginatorEnd.plus(intervalIncrease());
+                // Avoid reduced intervals
+                if (!intervalEnd.isAfter(paginatorEnd.plus(intervalIncrease()))) {
+                    paginatorEnd = intervalEnd;
                 }
                 updatePaginationButtons();
             }
@@ -570,7 +571,7 @@ public class AdvancedAllocationController extends GenericForwardComposer {
             paginatorStart = paginatorStart.plus(intervalIncrease());
             paginatorEnd = paginatorEnd.plus(intervalIncrease());
             // Avoid reduced last intervals
-            if ((paginatorEnd.plus(intervalIncrease()).isAfter(intervalEnd))) {
+            if (!intervalEnd.isAfter(paginatorEnd.plus(intervalIncrease()))) {
                 paginatorEnd = paginatorEnd.plus(intervalIncrease());
             }
             updatePaginationButtons();
@@ -1042,7 +1043,7 @@ abstract class ColumnOnRow implements IConvertibleToColumn {
     public Column toColumn() {
         Column column = new org.zkoss.zul.Column();
         column.setLabel(_(columnName));
-        column.setSclass(((String) columnName).toLowerCase());
+        column.setSclass(columnName.toLowerCase());
         return column;
     }