diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 7d567f8c..17c558b6 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>7.0.2.3</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>7.0.3.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs
index fda9db33..91b20c30 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -47,7 +47,8 @@ namespace ENI2.EditControls
             this.textBoxVisaNumber.Text = this.CREW.CrewMemberVisaNumber;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.CREW.CrewMemberIdentityDocumentIssuingState;
-            this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
+            if(this.CREW.CrewMemberIdentityDocumentExpiryDate.HasValue)
+                this.datePickerExpiryDate.SelectedDate = this.CREW.CrewMemberIdentityDocumentExpiryDate;
             // this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict; // XXX: TODO
             // this.comboBoxCountryOfBirth.SelectedValue = this.CREW.CrewMemberCountryOfBirth;
             // this.textBoxEffects.Text = this.CREW.Effects;
diff --git a/ENI2/EditControls/EditPasDialog.xaml.cs b/ENI2/EditControls/EditPasDialog.xaml.cs
index 53494ac0..f4587979 100644
--- a/ENI2/EditControls/EditPasDialog.xaml.cs
+++ b/ENI2/EditControls/EditPasDialog.xaml.cs
@@ -49,7 +49,8 @@ namespace ENI2.EditControls
             this.checkBoxTransitPassenger.IsChecked = this.PAS.PassengerInTransit;
             this.comboBoxIssuingState.ItemsSource = bsmd.database.CREW.NationalityDict;
             this.comboBoxIssuingState.SelectedValue = this.PAS.PassengerIdentityDocumentIssuingState;
-            this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
+            if(this.PAS.PassengerIdentityDocumentExpiryDate.HasValue)
+                this.datePickerExpiryDate.SelectedDate = this.PAS.PassengerIdentityDocumentExpiryDate;
             // XXX : TODO
             //this.comboBoxCountryOfBirth.ItemsSource = bsmd.database.CREW.NationalityDict;
             //this.comboBoxCountryOfBirth.SelectedValue = this.PAS.PassengerCountryOfBirth;
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 580074c5..9a0c9098 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -466,7 +466,7 @@ namespace ENI2.Excel
             string mouBaltic = isArrival ? "HAZA.MOUBaltic" : "HAZD.MOUBaltic";
             string shipClass = isArrival ? "HAZA.INFShipClass" : "HAZD.INFShipClass";
             HAZ haz = hazMessage.Elements[0] as HAZ;
-            WriteBoolean(noDPGOnBoard, haz.NoDPGOnBoardOnArrival);
+            WriteBoolean(noDPGOnBoard, !haz.NoDPGOnBoardOnArrival); // inverted "logic" in exported sheet
             WriteBoolean(dpgManifestOnBoard, haz.DPGManifestOnBoardOnArrival);
             WriteText(dpgContactFamilyName, haz.DPGContactFamilyName);
             WriteText(dpgContactPhone, haz.DPGContactPhone);
diff --git a/misc/db.sqlite b/misc/db.sqlite
index f9050a71..eb2c3e29 100644
Binary files a/misc/db.sqlite and b/misc/db.sqlite differ