diff --git a/libreplan-business/src/main/resources/db.changelog-1.4.xml b/libreplan-business/src/main/resources/db.changelog-1.4.xml
index a92cccb40..b33d15e11 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.4.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.4.xml
@@ -64,8 +64,8 @@
                 initiallyDeferred="false"
                 tableName="limits"/>
         <sql>
-            INSERT INTO limits VALUES(0, 'users', 5);
-            INSERT INTO limits VALUES(1, 'workers+machines', 10);
+            INSERT INTO limits VALUES(1, 'users', 5);
+            INSERT INTO limits VALUES(2, 'workers+machines', 10);
         </sql>
     </changeSet>
 
diff --git a/libreplan-business/src/main/resources/db.changelog-1.5.xml b/libreplan-business/src/main/resources/db.changelog-1.5.xml
index 128b0eeb6..5f750c3e0 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.5.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.5.xml
@@ -23,7 +23,7 @@
                 disabled="false"
                 initiallyDeferred="false"
                 tableName="email_template"
-                />
+        />
         <createIndex tableName="email_template" indexName="language_index">
             <column name="language"></column>
         </createIndex>
@@ -51,7 +51,7 @@
                 initiallyDeferred="false"/>
     </changeSet>
 
-    <changeSet id="adding-issue_log_table" author="misha">
+    <changeSet id="adding-issue_log_table" author="misha/vova">
         <createTable tableName="issue_log">
             <column name="id" type="BIGINT" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false" primaryKeyName="issue_log_pkey"/>
@@ -59,7 +59,7 @@
             <column name="code" type="varchar(25)"/>
             <column name="project" type="BIGINT"/>
             <column name="type" type="integer"/>
-            <column name="description" type="varchar"/>
+            <column name="description" type="varchar(512)"/>
             <column name="priority" type="integer"/>
             <column name="severity" type="integer"/>
             <column name="created_by" type="BIGINT"/>
@@ -68,8 +68,9 @@
             <column name="date_raised" type="timestamp with time zone"/>
             <column name="deadline" type="timestamp with time zone"/>
             <column name="date_resolved" type="timestamp with time zone"/>
-            <column name="notes" type="varchar"/>
+            <column name="notes" type="varchar(256)"/>
         </createTable>
+
         <addForeignKeyConstraint baseTableName="issue_log" baseColumnNames="project"
                                  constraintName="issue_log_project_order_element_table"
                                  referencedTableName="order_element"
@@ -85,17 +86,17 @@
                 disabled="false"
                 initiallyDeferred="false"
                 tableName="issue_log"
-                />
+        />
     </changeSet>
 
-    <changeSet id="adding-risk_log_table" author="misha">
+    <changeSet id="adding-risk_log_table" author="misha/vova">
         <createTable tableName="risk_log">
             <column name="id" type="BIGINT" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false" primaryKeyName="risk_log_pkey"/>
             </column>
             <column name="code" type="varchar(25)"/>
             <column name="project" type="BIGINT"/>
-            <column name="description" type="varchar"/>
+            <column name="description" type="varchar(512)"/>
             <column name="probability" type="integer"/>
             <column name="impact" type="integer"/>
             <column name="score" type="integer"/>
@@ -106,7 +107,7 @@
             <column name="counter_measures" type="varchar(50)"/>
             <column name="action_when" type="timestamp with time zone"/>
             <column name="date_created" type="timestamp with time zone"/>
-            <column name="notes" type="varchar"/>
+            <column name="notes" type="varchar(256)"/>
         </createTable>
         <addForeignKeyConstraint baseTableName="risk_log" baseColumnNames="project"
                                  constraintName="project_order_element_table"
@@ -123,7 +124,7 @@
                 disabled="false"
                 initiallyDeferred="false"
                 tableName="risk_log"
-                />
+        />
     </changeSet>
 
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Limits.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Limits.hbm.xml
index 1d9b3807d..ebad7883b 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Limits.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Limits.hbm.xml
@@ -11,7 +11,7 @@
         </id>
 
         <property name="type" column="type"/>
-        <property name="value" column="value" type="long"/>
+        <property name="value" column="value" type="integer"/>
 
     </class>
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java
index a7151a613..2fa0fba1d 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java
@@ -24,7 +24,6 @@ import static org.libreplan.web.I18nHelper._;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import org.apache.commons.logging.LogFactory;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
@@ -45,10 +44,16 @@ import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.*;
+import org.zkoss.zul.ListitemRenderer;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.RowRenderer;
+import org.zkoss.zul.Cell;
+import org.zkoss.zul.Label;
+import org.zkoss.zul.Hbox;
+import org.zkoss.zul.ListModelList;
+import org.zkoss.zul.Listbox;
+
 
-import javax.swing.*;
-import javax.swing.table.TableCellEditor;
 
 /**
  * Controller for IssueLog CRUD actions
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java
index f727abc9f..0abd1c3d6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java
@@ -45,7 +45,13 @@ import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
-import org.zkoss.zul.*;
+import org.zkoss.zul.Textbox;
+import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Row;
+import org.zkoss.zul.Cell;
+import org.zkoss.zul.ListitemRenderer;
+import org.zkoss.zul.Label;
+import org.zkoss.zul.RowRenderer;
 
 /**
  * Controller for RiskLog CRUD actions