diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 08bb0c24..871b5212 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -14,6 +14,7 @@ using System.IO;
 using System;
 using Microsoft.Win32;
 using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace ENI2.DetailViewControls
 {
@@ -178,7 +179,7 @@ namespace ENI2.DetailViewControls
 
             #region init WSDP provider
 
-            InitTemplates();
+            await InitTemplates();
             
             this.comboBox_WSDPTemplate.ItemsSource = _wsdpTemplates;
 
@@ -188,7 +189,7 @@ namespace ENI2.DetailViewControls
 
         #region Waste receipt grid event handler
 
-        private void DataGridWasteReceipt_CreateRequested()
+        private async void DataGridWasteReceipt_CreateRequested()
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = new WAS_RCPT();
@@ -219,7 +220,8 @@ namespace ENI2.DetailViewControls
                 this.dataGridWasteReceived.ItemsSource = null;                
                 dataGridWasteReceipt_SelectionChanged(this, null);
             }
-            InitTemplates(); // templates might have changed in the dialog
+
+            await InitTemplates(); // templates might have changed in the dialog
         }
 
         private void DataGridWasteReceipt_DeleteRequested(DatabaseEntity obj)
@@ -238,7 +240,7 @@ namespace ENI2.DetailViewControls
             }
         }
 
-        private void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
+        private async void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
         {
             EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
             epd.WAS_RCPT = obj as WAS_RCPT;
@@ -265,7 +267,7 @@ namespace ENI2.DetailViewControls
             this.dataGridWasteReceipt.Items.Refresh();
             this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
             dataGridWasteReceipt_SelectionChanged(this, null);
-            InitTemplates(); // templates might have changed in the dialog
+            await InitTemplates(); // templates might have changed in the dialog
         }
 
         private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
@@ -595,10 +597,11 @@ namespace ENI2.DetailViewControls
 
 
         #endregion
+        
 
         #region Waste disposal Service Provider templates event handler
 
-        private async void InitTemplates()
+        private async Task InitTemplates()
         {            
             _wsdpTemplates = await DBManagerAsync.GetWastDisposalServiceProviderTemplatesAsync();
             _wsdpTemplates.Sort();
diff --git a/ENI2/Report/ReportDocument.cs b/ENI2/Report/ReportDocument.cs
index 0e474a6d..5b5da75c 100644
--- a/ENI2/Report/ReportDocument.cs
+++ b/ENI2/Report/ReportDocument.cs
@@ -101,7 +101,7 @@ namespace ENI2.Report
             string migraTempFile = string.Format("{1}\\{0}.mdddl", filenameCore, Path.GetDirectoryName(filename));
             MigraDoc.DocumentObjectModel.IO.DdlWriter.WriteToFile(document, migraTempFile);
             
-            PdfDocumentRenderer renderer = new PdfDocumentRenderer(true);
+            PdfDocumentRenderer renderer = new PdfDocumentRenderer();
             renderer.Document = document;
             renderer.RenderDocument();
 
@@ -1250,8 +1250,9 @@ namespace ENI2.Report
 
         private static void CreateWAS_RCPTTable(Document document, Message message)
         {
-            foreach (WAS_RCPT was_rpct in message.Elements)
+            for (int i = 0; i < message.Elements.Count; i++)
             {
+                WAS_RCPT was_rpct = (WAS_RCPT)message.Elements[i];
                 document.LastSection.AddParagraph("");
 
                 Table table = AddGrayTable(document);