diff --git a/GUIs.ClientSuite/Common/ClassCommonViews.vb b/GUIs.ClientSuite/Common/ClassCommonViews.vb
index 287a1b80..759b61db 100644
--- a/GUIs.ClientSuite/Common/ClassCommonViews.vb
+++ b/GUIs.ClientSuite/Common/ClassCommonViews.vb
@@ -13,7 +13,7 @@ Public Class ClassCommonViews
         Try
             My.Channel.CreateDatabaseRequest("Load Controls", True)
 
-            Dim oSQL As String = $"SELECT * FROM VWIDB_FORMCONTROL WHERE FORMID = {FormId}"
+            Dim oSQL As String = $"SELECT * FROM VWIDB_FORM_CONTROL WHERE FORMID = {FormId}"
             Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
             Dim oTable = oResult.Table
 
@@ -35,7 +35,7 @@ Public Class ClassCommonViews
         Try
             My.Channel.CreateDatabaseRequest("Load Control Data", True)
 
-            Dim oSQL As String = $"SELECT * FROM VWIDB_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}"
+            Dim oSQL As String = $"SELECT * FROM VWIDB_WF_REQU_CTRL_DATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}"
             Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
             Dim oTable = oResult.Table
 
diff --git a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb
index 93199613..00da484b 100644
--- a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb
+++ b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb
@@ -24,8 +24,9 @@ Public Class frmWorkflowStep
 
     Private Async Function GetRequestData(RequestId) As Task
         Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True)
+        Dim oSQL = $"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWIDB_WF_REQUEST WHERE RECORD_ID = {RequestId}"
 
-        Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWIDB_WF_REQUEST WHERE RECORD_ID = {RequestId}")
+        Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
 
         If Not oResult.OK Then
             Throw New ApplicationException("Request data could not be fetched!")
diff --git a/Modules.Interfaces/ZUGFeRDInterface.vb b/Modules.Interfaces/ZUGFeRDInterface.vb
index 39a91fe1..3f2cf8e0 100644
--- a/Modules.Interfaces/ZUGFeRDInterface.vb
+++ b/Modules.Interfaces/ZUGFeRDInterface.vb
@@ -68,7 +68,7 @@ Public Class ZUGFeRDInterface
             Throw ex
         End Try
 
-        If Not oProcessOutput.Contains(ZUGFERD_CONVERTER_SUCCESS_MESSAGE) Then
+        If Not oProcessOutput.ToLower.Contains(ZUGFERD_CONVERTER_SUCCESS_MESSAGE.ToLower) Then
             _logger.Warn("File {0} is not a valid ZUGFeRD File!", Path)
             Throw New ZUGFeRDExecption(ErrorType.NoValidFile, "Datei ist kein gültiges ZUGFeRD Format.")
         End If