diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php
index 45a4d6f32b..3956e51c18 100644
--- a/lib/Doctrine/Entities/AggregateToken.php
+++ b/lib/Doctrine/Entities/AggregateToken.php
@@ -33,7 +33,7 @@ class AggregateToken
     private $usr_id;
 
     /**
-     * @ORM\Column(type="string", length=128)
+     * @ORM\Column(type="string", length=12, nullable=true)
      */
     private $value;
 
diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php
index dc6fa6410a..5d17381901 100644
--- a/lib/Doctrine/Entities/Feed.php
+++ b/lib/Doctrine/Entities/Feed.php
@@ -40,7 +40,7 @@ class Feed implements FeedInterface
     private $icon_url = false;
 
     /**
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="integer", nullable=true)
      */
     private $base_id;
 
@@ -50,7 +50,7 @@ class Feed implements FeedInterface
     private $title;
 
     /**
-     * @ORM\Column(type="string", length=128)
+     * @ORM\Column(type="string", length=1024, nullable=true)
      */
     private $subtitle;
 
@@ -67,30 +67,18 @@ class Feed implements FeedInterface
     private $updated_on;
 
     /**
-     * @ORM\OneToMany(
-     *   targetEntity="FeedPublisher",
-     *   mappedBy="feed",
-     *   cascade=["ALL"]
-     * )
+     * @ORM\OneToMany(targetEntity="FeedPublisher", mappedBy="feed", cascade={"ALL"})
      */
     private $publishers;
 
     /**
-     * @ORM\OneToMany(
-     *   targetEntity="FeedEntry",
-     *   mappedBy="feed",
-     *   cascade=["ALL"]
-     * )
+     * @ORM\OneToMany(targetEntity="FeedEntry", mappedBy="feed", cascade={"ALL"})
      * @ORM\OrderBy({"created_on" = "ASC"})
      */
     private $entries;
 
     /**
-     * @ORM\OneToMany(
-     *   targetEntity="FeedToken",
-     *   mappedBy="feed",
-     *   cascade=["ALL"]
-     * )
+     * @ORM\OneToMany(targetEntity="FeedToken", mappedBy="feed", cascade={"ALL"})
      */
     private $tokens;
 
diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php
index a87c5bb0b6..6c21006d0e 100644
--- a/lib/Doctrine/Entities/FeedEntry.php
+++ b/lib/Doctrine/Entities/FeedEntry.php
@@ -60,11 +60,7 @@ class FeedEntry
     private $updated_on;
 
     /**
-     * @ORM\OneToMany(
-     *   targetEntity="FeedItem",
-     *   mappedBy="entry",
-     *   cascade=["ALL"]
-     * )
+     * @ORM\OneToMany(targetEntity="FeedItem", mappedBy="entry", cascade={"ALL"})
      * @ORM\OrderBy({"ord" = "ASC"})
      */
     private $items;
diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php
index 83f8123e90..a23135cfb5 100644
--- a/lib/Doctrine/Entities/FeedItem.php
+++ b/lib/Doctrine/Entities/FeedItem.php
@@ -17,9 +17,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
- * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={
- *         "entry_id","sbas_id","record_id"
- * }})
+ * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={"entry_id","sbas_id","record_id"})})
  * @ORM\Entity(repositoryClass="Repositories\FeedItemRepository")
  * @HasLifecycleCallbacks
  */
@@ -42,6 +40,11 @@ class FeedItem
      */
     private $sbas_id;
 
+    /**
+     * @ORM\Column(type="integer")
+     */
+    private $ord;
+
     /**
      * @Gedmo\Timestampable(on="create")
      * @ORM\Column(type="datetime")
@@ -138,10 +141,6 @@ class FeedItem
     {
         return $this->entry;
     }
-    /**
-     * @var integer
-     */
-    private $ord;
 
     /**
      * Set ord
diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php
index 704e9104b3..b8a12206cb 100644
--- a/lib/Doctrine/Entities/FeedToken.php
+++ b/lib/Doctrine/Entities/FeedToken.php
@@ -32,6 +32,11 @@ class FeedToken
      */
     private $usr_id;
 
+    /**
+     * @ORM\Column(type="string", length=12, nullable=true)
+     */
+    private $value;
+
     /**
      * @ORM\ManyToOne(targetEntity="Feed", inversedBy="tokens", cascade={"persist"})
      * @ORM\JoinColumn(name="feed_id", referencedColumnName="id")
@@ -93,10 +98,6 @@ class FeedToken
     {
         return $this->feed;
     }
-    /**
-     * @ORM\Column(type="string", length=128)
-     */
-    private $value;
 
     /**
      * Set value