diff --git a/interface/forms/fee_sheet/new.php b/interface/forms/fee_sheet/new.php
index 7c9fc412205..cda111b4817 100644
--- a/interface/forms/fee_sheet/new.php
+++ b/interface/forms/fee_sheet/new.php
@@ -1501,9 +1501,6 @@ function pricelevel_changed(sel) {
                                     <input type='hidden' name='form_checksum' value='<?php echo attr($current_checksum); ?>' />
                                     <input type='hidden' name='form_alertmsg' value='<?php echo attr($alertmsg); ?>' />
                             </div>
-                            <input type='hidden' name='form_has_charges' value='<?php echo $fs->hasCharges ? 1 : 0; ?>' />
-                            <input type='hidden' name='form_checksum' value='<?php echo attr($current_checksum); ?>' />
-                            <input type='hidden' name='form_alertmsg' value='<?php echo attr($alertmsg); ?>' />
                         </div>
                     </div>
                 </form>
diff --git a/interface/forms/newpatient/common.php b/interface/forms/newpatient/common.php
index ed0543c944e..f5072187189 100644
--- a/interface/forms/newpatient/common.php
+++ b/interface/forms/newpatient/common.php
@@ -146,7 +146,6 @@ function refreshIssue(issue, title) {
                 e.preventDefault();
                 e.stopPropagation();
                 dlgopen('', '', 700, 650, '', '', {
-                    buttons: [{text: <?php echo xlj('Close'); ?>, close: true, style: 'default btn-sm'}],
                     allowResize: true,
                     allowDrag: true,
                     dialogId: '',
diff --git a/interface/forms/procedure_order/new.php b/interface/forms/procedure_order/new.php
index 9b38ac2e632..4a8596d5857 100644
--- a/interface/forms/procedure_order/new.php
+++ b/interface/forms/procedure_order/new.php
@@ -424,8 +424,8 @@ function addProcLine(flag = false) {
 var rcvarname, targetElement, targetProcedure;
 
 function current_diagnoses(whereElement) {
-    targetProcedure = whereElement.parentElement.parentElement.previousElementSibling;
-    targetElement = whereElement.parentElement.nextElementSibling;
+    targetProcedure = whereElement.parentElement.parentElement.parentElement.previousElementSibling;
+    targetElement = whereElement.parentElement.parentElement.nextElementSibling;
     let title = <?php echo xlj("Diagnosis Codes History"); ?>;
     dlgopen('find_code_history.php', 'dxDialog', 'modal-mlg', 450, '', title, {
         buttons: [
diff --git a/interface/patient_file/encounter/find_code_history.php b/interface/patient_file/encounter/find_code_history.php
index 1447dccc26a..42cf021efff 100644
--- a/interface/patient_file/encounter/find_code_history.php
+++ b/interface/patient_file/encounter/find_code_history.php
@@ -135,7 +135,7 @@ function setCodes() {
                 setFormDx();
             };
             targetTipsButton.onclick = function () {
-                $("#tips").toggle();
+                $("#tips").toggleClass("d-none");
             };
             // search table to find a match for procedure we are seeking dx for.
             let src = opener.targetProcedure.children[1].value;
@@ -181,7 +181,7 @@ function setCodes() {
                         echo "<li>" . xlt("The legacy code finder is still available for codes not found in this finder or code list editing.") . "</li>";
                         ?>
                     </ul>
-                    <button class='btn btn-sm btn-success float-right' onclick='$("#tips").toggle();return false;'><?php echo xlt('Dismiss') ?></button>
+                    <button class='btn btn-sm btn-success float-right' onclick='$("#tips").toggleClass("d-none");return false;'><?php echo xlt('Dismiss') ?></button>
                 </div>
             </section>
         </div>
diff --git a/interface/patient_file/summary/add_edit_issue.php b/interface/patient_file/summary/add_edit_issue.php
index ddbec343904..e103f123a00 100644
--- a/interface/patient_file/summary/add_edit_issue.php
+++ b/interface/patient_file/summary/add_edit_issue.php
@@ -891,7 +891,7 @@ function divclick(cb, divid) {
                         } ?>>
                             <label class="col-form-label" for="form_destination"><?php echo xlt('Destination'); ?>:</label>
                             <?php if (true) { ?>
-                                <input type='text' class='form-control' name='form_destination' id='form_destination' value='<?php echo attr($irow['destination']) ?>' style='width:100%' title='GP, delete care specialist, etc.' />
+                                <input type='text' class='form-control' name='form_destination' id='form_destination' value='<?php echo attr($irow['destination']) ?>' style='width:100%' title='GP, Secondary care specialist, etc.' />
                             <?php } else { // leave this here for now, please -- Rod
                                 ?>
                                 <?php echo rbinput('form_destination', '1', 'GP', 'destination') ?>&nbsp;