diff --git a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/jquery/nfeditor/languages/nfeditor.css b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/jquery/nfeditor/languages/nfeditor.css
index abf9437ef984..24093e000a22 100644
--- a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/jquery/nfeditor/languages/nfeditor.css
+++ b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/js/jquery/nfeditor/languages/nfeditor.css
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+ul.CodeMirror-hints {
+    overflow-y: scroll;
+}
+
 div.el-section {
     margin: 5px 0;
 }
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.spec.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.spec.ts
index 7ae42d3448f2..1076af4bce8c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.spec.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.spec.ts
@@ -16,7 +16,8 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Canvas } from './canvas.component';
 import { provideMockStore } from '@ngrx/store/testing';
 import { initialState } from '../../state/flow/flow.reducer';
@@ -30,9 +31,7 @@ import { HeaderComponent } from './header/header.component';
 import { FooterComponent } from './footer/footer.component';
 import { canvasFeatureKey } from '../../state';
 import { flowFeatureKey } from '../../state/flow';
-import { MatSidenavModule } from '@angular/material/sidenav';
 import { FlowAnalysisDrawerComponent } from './header/flow-analysis-drawer/flow-analysis-drawer.component';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CanvasActionsService } from '../../service/canvas-actions.service';
 
 describe('Canvas', () => {
@@ -60,6 +59,8 @@ describe('Canvas', () => {
                 ContextMenu,
                 MatSidenavModule,
                 NoopAnimationsModule,
+                MatSidenavModule,
+                NoopAnimationsModule,
                 MockComponent(GraphControls),
                 MockComponent(HeaderComponent),
                 MockComponent(FooterComponent),
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.html
index 51a7ac722e43..a13c350a106e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.html
@@ -61,7 +61,7 @@ <h2 mat-dialog-title>Create New {{ portTypeLabel }}</h2>
             <button mat-button mat-dialog-close>Cancel</button>
             <button
                 [disabled]="!createPortForm.dirty || createPortForm.invalid || saving.value"
-                type="button"
+                type="submit"
                 color="primary"
                 (click)="createPort()"
                 mat-button>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.html
index 737e4027ac09..65b9b0ee5147 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.html
@@ -77,7 +77,7 @@ <h2 mat-dialog-title>Create Process Group</h2>
             <button mat-button mat-dialog-close>Cancel</button>
             <button
                 [disabled]="!createProcessGroupForm.dirty || createProcessGroupForm.invalid || saving.value"
-                type="button"
+                type="submit"
                 color="primary"
                 (click)="createProcessGroup()"
                 mat-button>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts
index 38424a9e2976..ed839d76b85c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts
@@ -122,6 +122,11 @@ describe('ComboEditor', () => {
     it('should create', () => {
         if (item) {
             component.item = item;
+            component.parameterConfig = {
+                supportsParameters: false,
+                parameters: null
+            };
+
             fixture.detectChanges();
 
             expect(component).toBeTruthy();
@@ -131,6 +136,11 @@ describe('ComboEditor', () => {
     it('verify combo value', () => {
         if (item) {
             component.item = item;
+            component.parameterConfig = {
+                supportsParameters: false,
+                parameters: null
+            };
+
             fixture.detectChanges();
 
             const formValue = component.comboEditorForm.get('value')?.value;
@@ -149,6 +159,11 @@ describe('ComboEditor', () => {
             item.descriptor.required = false;
 
             component.item = item;
+            component.parameterConfig = {
+                supportsParameters: false,
+                parameters: null
+            };
+
             fixture.detectChanges();
 
             const formValue = component.comboEditorForm.get('value')?.value;
@@ -168,6 +183,11 @@ describe('ComboEditor', () => {
             item.descriptor.defaultValue = undefined;
 
             component.item = item;
+            component.parameterConfig = {
+                supportsParameters: false,
+                parameters: null
+            };
+
             fixture.detectChanges();
 
             const formValue = component.comboEditorForm.get('value')?.value;
@@ -185,7 +205,11 @@ describe('ComboEditor', () => {
             item.value = '#{one}';
 
             component.item = item;
-            component.parameters = parameters;
+            component.parameterConfig = {
+                supportsParameters: true,
+                parameters
+            };
+
             fixture.detectChanges();
             await fixture.whenStable();
 
@@ -207,7 +231,11 @@ describe('ComboEditor', () => {
             item.value = '#{three}';
 
             component.item = item;
-            component.parameters = parameters;
+            component.parameterConfig = {
+                supportsParameters: true,
+                parameters
+            };
+
             fixture.detectChanges();
             await fixture.whenStable();