diff --git a/packages/react-sdk-components/src/components/field/RadioButtons/RadioButtons.tsx b/packages/react-sdk-components/src/components/field/RadioButtons/RadioButtons.tsx
index 02db2b0d..671eab91 100644
--- a/packages/react-sdk-components/src/components/field/RadioButtons/RadioButtons.tsx
+++ b/packages/react-sdk-components/src/components/field/RadioButtons/RadioButtons.tsx
@@ -29,7 +29,8 @@ export default function RadioButtons(props: RadioButtonsProps) {
     inline,
     displayMode,
     hideLabel,
-    fieldMetadata
+    fieldMetadata,
+    disabled
   } = props;
   const [theSelectedButton, setSelectedButton] = useState(value);
 
@@ -102,7 +103,7 @@ export default function RadioButtons(props: RadioButtonsProps) {
                 localePath,
                 thePConn.getLocaleRuleNameFromKeys(localeClass, localeContext, localeName)
               )}
-              control={<Radio key={theOption.key} color='primary' disabled={readOnly} />}
+              control={<Radio key={theOption.key} color='primary' disabled={readOnly || disabled} />}
             />
           );
         })}
diff --git a/packages/react-sdk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx b/packages/react-sdk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx
index d9e781ff..0767a4d0 100644
--- a/packages/react-sdk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx
+++ b/packages/react-sdk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx
@@ -722,7 +722,9 @@ export default function SimpleTableManual(props: PropsWithChildren<SimpleTableMa
                 })}
           </TableBody>
         </Table>
-        {((readOnlyMode && (!rowData || rowData?.length === 0)) || (editableMode && (!referenceList || referenceList?.length === 0))) && (
+        {((readOnlyMode && (!rowData || rowData?.length === 0)) ||
+          (editableMode && (!referenceList || referenceList?.length === 0)) ||
+          (allowEditingInModal && (!rowData || rowData?.length === 0))) && (
           <div className='no-records' id='no-records'>
             {getGenericFieldsLocalizedValue('CosmosFields.fields.lists', 'No records found.')}
           </div>
diff --git a/packages/react-sdk-components/tests/e2e/Digv2/ComplexFields/DataReference.spec.js b/packages/react-sdk-components/tests/e2e/Digv2/ComplexFields/DataReference.spec.js
index 7d070476..237883cd 100644
--- a/packages/react-sdk-components/tests/e2e/Digv2/ComplexFields/DataReference.spec.js
+++ b/packages/react-sdk-components/tests/e2e/Digv2/ComplexFields/DataReference.spec.js
@@ -88,7 +88,7 @@ test.describe('E2E test', () => {
 
     selectedTestName = page.locator('div[data-test-id="6f64b45d01d11d8efd1693dfcb63b735"]');
     await selectedTestName.click();
-    await page.locator('li:has-text("Table")').click();
+    await page.getByRole('option', { name: 'Table', exact: true }).click();
 
     selectedProduct = page.locator('tr:has-text("Basic Product")');
     const selectedProductRow = selectedProduct.locator('input[type="radio"]');
diff --git a/packages/react-sdk-components/tests/e2e/Digv2/FormFields/Attachment.spec.js b/packages/react-sdk-components/tests/e2e/Digv2/FormFields/Attachment.spec.js
index 96f91d95..6bb7473d 100644
--- a/packages/react-sdk-components/tests/e2e/Digv2/FormFields/Attachment.spec.js
+++ b/packages/react-sdk-components/tests/e2e/Digv2/FormFields/Attachment.spec.js
@@ -123,8 +123,8 @@ test.describe('E2E test', () => {
 
     /** Delete attachment */
     await menuSelector.locator('li >> text="Delete"').click();
-    await expect(page.locator('div >> text="cableinfo.jpg"')).toBeVisible();
-    await expect(page.locator('div >> text="cablechat.jpg"')).toBeHidden();
+    await expect(page.locator('div >> text="cableinfo.jpg"')).toBeHidden();
+    await expect(page.locator('div >> text="cablechat.jpg"')).toBeVisible();
   }, 10000);
 });
 
diff --git a/packages/react-sdk-components/tests/e2e/Digv2/FormFields/URL.spec.js b/packages/react-sdk-components/tests/e2e/Digv2/FormFields/URL.spec.js
index 1051617f..139a4782 100644
--- a/packages/react-sdk-components/tests/e2e/Digv2/FormFields/URL.spec.js
+++ b/packages/react-sdk-components/tests/e2e/Digv2/FormFields/URL.spec.js
@@ -83,7 +83,7 @@ test.describe('E2E test', () => {
     await expect(attributes.includes('readonly')).toBeFalsy();
 
     /** Validation tests */
-    const validationMsg = 'Please enter a valid URL including the protocol (http://, https://, ftp://, etc.)';
+    const validationMsg = 'Please enter a valid URL including the protocol (http://, https:// etc.)';
     await editableURL.fill('InvalidUrl');
     await editableURL.blur();
     await expect(page.locator(`p:has-text("${validationMsg}")`)).toBeVisible();