diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
index 356d36ad07..357497e845 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html
@@ -158,7 +158,7 @@ <h4 fxFlex="98%" class="mat-h4 m-r-10">{{'labels.inputs.Moratorium' | translate}
       </mat-select>
       <button mat-button *ngIf="loanProductSettingsForm.controls.delinquencyBucketId" matSuffix mat-icon-button
         aria-label="Clear" (click)="clearProperty($event, 'delinquencyBucketId')">
-        <mat-icon>close</mat-icon>
+        <i class="fa fa-close"></i>
       </button>
     </mat-form-field>
 
diff --git a/src/app/reports/run-report/run-report.component.ts b/src/app/reports/run-report/run-report.component.ts
index b5ddf37928..8c63fe2f5b 100644
--- a/src/app/reports/run-report/run-report.component.ts
+++ b/src/app/reports/run-report/run-report.component.ts
@@ -125,8 +125,10 @@ export class RunReportComponent implements OnInit {
         } else { // Child Parameter
           const parent: ReportParameter = this.paramData
             .find((entry: any) => entry.name === param.parentParameterName);
-          parent.childParameters.push(param);
-          this.updateParentParameters(parent);
+          if (parent != null) {
+            parent.childParameters.push(param);
+            this.updateParentParameters(parent);
+          }
         }
       });
     if (this.isPentahoReport()) {
diff --git a/src/app/reports/run-report/table-and-sms/table-and-sms.component.scss b/src/app/reports/run-report/table-and-sms/table-and-sms.component.scss
index c649ed7aba..1bce667048 100644
--- a/src/app/reports/run-report/table-and-sms/table-and-sms.component.scss
+++ b/src/app/reports/run-report/table-and-sms/table-and-sms.component.scss
@@ -1,11 +1,16 @@
+.table-output {
+  overflow: auto;
+}
+
 .select-row:hover {
-    cursor: pointer;
-  }
+  cursor: pointer;
+}
 
-.mat-header-cell, .mat-cell {
-    min-width: 150px;
-    margin-left: 5px;
-    margin-right: 5px;
+.mat-header-cell,
+.mat-cell {
+  min-width: 150px;
+  margin-left: 5px;
+  margin-right: 5px;
 }
 
 .back-button {
@@ -95,4 +100,4 @@ $color: #e2e4ec;
   100% {
     width: $bar;
   }
-}
+}
\ No newline at end of file