diff --git a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Assets/SlmComponents_AssetMovement.cs b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Assets/SlmComponents_AssetMovement.cs
index cc5ab9e..e6dbd62 100644
--- a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Assets/SlmComponents_AssetMovement.cs
+++ b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Assets/SlmComponents_AssetMovement.cs
@@ -97,7 +97,7 @@ namespace Sarand.LogisticsMgr.Mobile.Forms.Components.Assets
 			if (!StringUtil.IsEmpty(data.AssetSizeCode) && !PickerAssetSize.ContainsCode(data.AssetSizeCode))
 				PickerAssetSize.AddItem(data.AssetSizeCode, data.AssetSizeCode);
 			PickerAssetSize.SelectedCode = data.AssetSizeCode;
-			PickerMovementType.SelectedCode = movementTypes.GetCodeForType((int)data.MovementType);
+			PickerMovementType.SelectedCode = movementTypes.GetCodeForType(data.MovementType);
 			EntryReference.Text = data.MovementRef;
 			DatePickerMovementDate.Date = data.MovementAt;
 			EntryCustomer.Text = data.Customer;
diff --git a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Bulk/SlmComponents_BerthingTask.cs b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Bulk/SlmComponents_BerthingTask.cs
index 3811094..4d8e5fa 100644
--- a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Bulk/SlmComponents_BerthingTask.cs
+++ b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Components/Bulk/SlmComponents_BerthingTask.cs
@@ -63,7 +63,7 @@ namespace Sarand.LogisticsMgr.Mobile.Forms.Components.Bulk
 		//-------------------------------------------------------------------
 		public void PopulateToControls (SlmBerthingTask.Data data)
 		{
-			PickerTaskType.SelectedCode = berthingTaskTypes.GetCodeForType((int)data.BerthingTaskType);
+			PickerTaskType.SelectedCode = berthingTaskTypes.GetCodeForType(data.BerthingTaskType);
 			DateTimePickerStarted.DateTime = data.Started;
 			DateTimePickerCompleted.DateTime = data.Completed;
 			EditorRemarks.Text = data.Remarks;
diff --git a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Panels/Bulk/SlmPanel_Bulk_BerthingTasks.cs b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Panels/Bulk/SlmPanel_Bulk_BerthingTasks.cs
index 4817fef..6aebe2a 100644
--- a/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Panels/Bulk/SlmPanel_Bulk_BerthingTasks.cs
+++ b/LogisticsMgrMobile/LogisticsMgrMobile/Mobile/Forms/Panels/Bulk/SlmPanel_Bulk_BerthingTasks.cs
@@ -177,7 +177,7 @@ namespace Sarand.LogisticsMgr.Mobile.Forms.Panels.Bulk
 				html.Add("<table class='fullwidth'>");
 				html.Add(" <tr>");
 				html.Add("  <td class='label'>Started</td><td class='value'>" + DateUtil.Format(item.Started, "ddd d-MMM-yyyy HH:mm") + "</td>");
-				html.Add("  <td class='label'>Type</td><td class='value'>" + berthingTaskTypes.GetDescForType((int)item.BerthingTaskType) + "</td>");
+				html.Add("  <td class='label'>Type</td><td class='value'>" + berthingTaskTypes.GetDescForType(item.BerthingTaskType) + "</td>");
 				html.Add(" </tr>");
 				html.Add(" <tr>");
 				List<String> remarkLines = new List<string>(item.Remarks.Split('\n'));
diff --git a/SaLogMgrMobCore/Mobile/Core/Mgr/SlmBerthingMgr_Mobile-Berthings.cs b/SaLogMgrMobCore/Mobile/Core/Mgr/SlmBerthingMgr_Mobile-Berthings.cs
index 6b7fe59..460ba89 100644
--- a/SaLogMgrMobCore/Mobile/Core/Mgr/SlmBerthingMgr_Mobile-Berthings.cs
+++ b/SaLogMgrMobCore/Mobile/Core/Mgr/SlmBerthingMgr_Mobile-Berthings.cs
@@ -148,7 +148,7 @@ namespace Sarand.LogisticsMgr.Mobile.Core.Mgr
 			berthingElement.AppendElement(nameof(berthing.RateLorry), berthing.RateLorry.ToString("N3"));
 			berthingElement.AppendElement(nameof(berthing.RateQuayside), berthing.RateQuayside.ToString("N3"));
 			berthingElement.AppendElement(nameof(berthing.RateOvertime), berthing.RateOvertime.ToString("N3"));
-			berthingElement.AppendElement(nameof(berthing.SpecialInstr), berthing.SpecialInstr);
+			berthingElement.AppendElement(nameof(berthing.SpecialInstructions), berthing.SpecialInstructions);
 			// Common properties.
 			this.PopulateCommonPropertiesTo(berthingElement, berthing, excludedProperties, dbUpdateInfo);
 		}
@@ -174,7 +174,7 @@ namespace Sarand.LogisticsMgr.Mobile.Core.Mgr
 			berthing.RateLorry = itemData.GetDecimalValue(nameof(SlmBerthing.RateLorry));
 			berthing.RateQuayside = itemData.GetDecimalValue(nameof(SlmBerthing.RateQuayside));
 			berthing.RateOvertime = itemData.GetDecimalValue(nameof(SlmBerthing.RateOvertime));
-			berthing.SpecialInstr = itemData.GetValue(nameof(SlmBerthing.SpecialInstr));
+			berthing.SpecialInstructions = itemData.GetValue(nameof(SlmBerthing.SpecialInstructions));
 			// Common properties.
 			this.PopulateCommonPropertiesFrom(itemData, berthing);
 			berthing.AcceptChanges();