diff --git a/Cicm.Database/Models/Company.cs b/Cicm.Database/Models/Company.cs
index d022e0ff..4c3a9dc3 100644
--- a/Cicm.Database/Models/Company.cs
+++ b/Cicm.Database/Models/Company.cs
@@ -52,7 +52,8 @@ namespace Cicm.Database.Models
 
         [Required]
         public string Name { get; set; }
-        [DisplayFormat(DataFormatString = "{0:d}")]
+        [DisplayFormat(DataFormatString = "{0:d}", ApplyFormatInEditMode = true)]
+        [DataType(DataType.Date)]
         public DateTime? Founded { get; set; }
         [Url]
         [StringLength(255)]
@@ -62,6 +63,7 @@ namespace Cicm.Database.Models
         [StringLength(45)]
         public string Facebook { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
+        [DataType(DataType.Date)]
         public DateTime? Sold { get; set; }
         public int? SoldToId { get;  set; }
         [StringLength(80)]
@@ -105,6 +107,6 @@ namespace Cicm.Database.Models
                     : Sold.Value.ToShortDateString();
 
         [NotMapped]
-        public CompanyDescription Description => Descriptions.FirstOrDefault();
+        public CompanyDescription Description => Descriptions?.FirstOrDefault();
     }
 }
\ No newline at end of file
diff --git a/Cicm.Database/Models/Gpu.cs b/Cicm.Database/Models/Gpu.cs
index 4f2010e5..0ddf148e 100644
--- a/Cicm.Database/Models/Gpu.cs
+++ b/Cicm.Database/Models/Gpu.cs
@@ -53,6 +53,7 @@ namespace Cicm.Database.Models
         [StringLength(45)]
         public string ModelCode { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
+        [DataType(DataType.Date)]
         public DateTime? Introduced { get; set; }
         [StringLength(45)]
         public string Package { get; set; }
diff --git a/Cicm.Database/Models/Machine.cs b/Cicm.Database/Models/Machine.cs
index f952fe2d..20352d06 100644
--- a/Cicm.Database/Models/Machine.cs
+++ b/Cicm.Database/Models/Machine.cs
@@ -55,6 +55,7 @@ namespace Cicm.Database.Models
         [Required]
         public MachineType Type { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
+        [DataType(DataType.Date)]
         public DateTime? Introduced { get; set; }
         public int? FamilyId { get;        set; }
         [StringLength(50)]
diff --git a/Cicm.Database/Models/Processor.cs b/Cicm.Database/Models/Processor.cs
index f4dde635..3205b850 100644
--- a/Cicm.Database/Models/Processor.cs
+++ b/Cicm.Database/Models/Processor.cs
@@ -53,6 +53,7 @@ namespace Cicm.Database.Models
         [StringLength(45)]
         public string ModelCode { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
+        [DataType(DataType.Date)]
         public DateTime? Introduced { get; set; }
         [DisplayName("Instruction set")]
         public int? InstructionSetId { get; set; }
diff --git a/Cicm.Database/Models/SoundSynth.cs b/Cicm.Database/Models/SoundSynth.cs
index ce6e9d5e..a35ce4a9 100644
--- a/Cicm.Database/Models/SoundSynth.cs
+++ b/Cicm.Database/Models/SoundSynth.cs
@@ -51,6 +51,7 @@ namespace Cicm.Database.Models
         [StringLength(45)]
         public string ModelCode { get; set; }
         [DisplayFormat(DataFormatString = "{0:d}")]
+        [DataType(DataType.Date)]
         public DateTime? Introduced { get; set; }
         [DisplayName("PCM voices")]
         [Range(1, int.MaxValue)]