diff --git a/src/Components/Blueprints/BlueprintActionsMenu.tsx b/src/Components/Blueprints/BlueprintActionsMenu.tsx
index 161b5a658..495a492c0 100644
--- a/src/Components/Blueprints/BlueprintActionsMenu.tsx
+++ b/src/Components/Blueprints/BlueprintActionsMenu.tsx
@@ -63,7 +63,6 @@ export const BlueprintActionsMenu: React.FunctionComponent<
           variant="plain"
           aria-label="blueprint menu toggle"
           data-testid="blueprint-action-menu-toggle"
-          isDisabled={selectedBlueprintId === undefined}
         >
           <EllipsisVIcon aria-hidden="true" />
         </MenuToggle>
diff --git a/src/Components/Blueprints/BlueprintsPagination.tsx b/src/Components/Blueprints/BlueprintsPagination.tsx
index c45fec53c..ef2b5e5ed 100644
--- a/src/Components/Blueprints/BlueprintsPagination.tsx
+++ b/src/Components/Blueprints/BlueprintsPagination.tsx
@@ -32,7 +32,7 @@ const BlueprintsPagination = () => {
   const { data: blueprintsData } = useGetBlueprintsQuery(searchParams);
   const dispatch = useAppDispatch();
 
-  const blueprintsTotal = blueprintsData?.meta?.count || 0;
+  const blueprintsTotal = blueprintsData?.meta.count || 0;
   const onSetPage: OnSetPage = (_, page) => {
     const direction = page > currPage ? 1 : -1; // Calculate offset based on direction of paging
     const nextOffset = blueprintsOffset + direction * blueprintsLimit;
diff --git a/src/Components/Blueprints/BlueprintsSideBar.tsx b/src/Components/Blueprints/BlueprintsSideBar.tsx
index a94985420..1e0bd34ec 100644
--- a/src/Components/Blueprints/BlueprintsSideBar.tsx
+++ b/src/Components/Blueprints/BlueprintsSideBar.tsx
@@ -82,7 +82,7 @@ const BlueprintsSidebar = () => {
   const dispatch = useAppDispatch();
   const blueprints = blueprintsData?.data;
 
-  const blueprintsTotal = blueprintsData?.meta?.count || 0;
+  const blueprintsTotal = blueprintsData?.meta.count || 0;
 
   if (isLoading) {
     return (
diff --git a/src/Components/Blueprints/BuildImagesButton.tsx b/src/Components/Blueprints/BuildImagesButton.tsx
index bdcaa639c..25e364ff9 100644
--- a/src/Components/Blueprints/BuildImagesButton.tsx
+++ b/src/Components/Blueprints/BuildImagesButton.tsx
@@ -46,7 +46,7 @@ export const BuildImagesButton = ({ children }: BuildImagesButtonPropTypes) => {
           id: selectedBlueprintId,
           body: {
             image_types: blueprintImageType?.filter(
-              (target) => !deselectedTargets?.includes(target)
+              (target) => !deselectedTargets.includes(target)
             ),
           },
         });
@@ -78,7 +78,7 @@ export const BuildImagesButton = ({ children }: BuildImagesButtonPropTypes) => {
   ) => {
     const imageType = blueprintImageType?.[itemId];
 
-    if (imageType && deselectedTargets?.includes(imageType)) {
+    if (imageType && deselectedTargets.includes(imageType)) {
       setDeselectedTargets(
         deselectedTargets.filter((target) => target !== imageType)
       );
@@ -143,7 +143,8 @@ export const BuildImagesButton = ({ children }: BuildImagesButtonPropTypes) => {
                 hasCheckbox
                 itemId={index}
                 isSelected={
-                  !deselectedTargets || !deselectedTargets.includes(imageType)
+                  deselectedTargets.length === 0 ||
+                  !deselectedTargets.includes(imageType)
                 }
               >
                 {targetOptions[imageType]}
diff --git a/src/Components/Blueprints/DeleteBlueprintModal.tsx b/src/Components/Blueprints/DeleteBlueprintModal.tsx
index 56a30fa7d..841d69da7 100644
--- a/src/Components/Blueprints/DeleteBlueprintModal.tsx
+++ b/src/Components/Blueprints/DeleteBlueprintModal.tsx
@@ -48,7 +48,7 @@ export const DeleteBlueprintModal: React.FunctionComponent<
 
   const { blueprintName } = useGetBlueprintsQuery(searchParams, {
     selectFromResult: ({ data }) => ({
-      blueprintName: data?.data?.find(
+      blueprintName: data?.data.find(
         (blueprint: { id: string | undefined }) =>
           blueprint.id === selectedBlueprintId
       )?.name,
diff --git a/src/Components/Blueprints/helpers/onPremToHostedBlueprintMapper.tsx b/src/Components/Blueprints/helpers/onPremToHostedBlueprintMapper.tsx
index d7997f797..26fad980e 100644
--- a/src/Components/Blueprints/helpers/onPremToHostedBlueprintMapper.tsx
+++ b/src/Components/Blueprints/helpers/onPremToHostedBlueprintMapper.tsx
@@ -143,7 +143,7 @@ export const mapOnPremToHosted = (
       fips:
         blueprint.customizations?.fips !== undefined
           ? {
-              enabled: blueprint.customizations?.fips,
+              enabled: blueprint.customizations.fips,
             }
           : undefined,
       timezone:
diff --git a/src/Components/ImagesTable/ImagesTable.tsx b/src/Components/ImagesTable/ImagesTable.tsx
index 8695ff22b..8e9f8ffcf 100644
--- a/src/Components/ImagesTable/ImagesTable.tsx
+++ b/src/Components/ImagesTable/ImagesTable.tsx
@@ -103,7 +103,7 @@ const ImagesTable = () => {
     searchParamsGetBlueprints,
     {
       selectFromResult: ({ data }) => ({
-        selectedBlueprintVersion: data?.data?.find(
+        selectedBlueprintVersion: data?.data.find(
           (blueprint: BlueprintItem) => blueprint.id === selectedBlueprintId
         )?.version,
       }),
diff --git a/src/Components/ImagesTable/ImagesTableToolbar.tsx b/src/Components/ImagesTable/ImagesTableToolbar.tsx
index 3ca71b4e5..a82ee4110 100644
--- a/src/Components/ImagesTable/ImagesTableToolbar.tsx
+++ b/src/Components/ImagesTable/ImagesTableToolbar.tsx
@@ -76,7 +76,7 @@ const ImagesTableToolbar: React.FC<imagesTableToolbarProps> = ({
       { search: blueprintSearchInput as string },
       {
         selectFromResult: ({ data }) => {
-          const bp = data?.data?.find(
+          const bp = data?.data.find(
             (blueprint: BlueprintItem) => blueprint.id === selectedBlueprintId
           );
           return {
diff --git a/src/Components/ImagesTable/Instance.tsx b/src/Components/ImagesTable/Instance.tsx
index 651c3bba3..24f1cc921 100644
--- a/src/Components/ImagesTable/Instance.tsx
+++ b/src/Components/ImagesTable/Instance.tsx
@@ -55,7 +55,7 @@ type CloudInstancePropTypes = {
 export const CloudInstance = ({ compose }: CloudInstancePropTypes) => {
   const { initialized: chromeInitialized } = useChrome();
   const scalprum = useScalprum();
-  const hasProvisioning = chromeInitialized && scalprum.config?.provisioning;
+  const hasProvisioning = chromeInitialized && scalprum.config.provisioning;
 
   const { data, isSuccess } = useGetComposeStatusQuery({
     composeId: compose.id,
@@ -114,7 +114,7 @@ const ProvisioningLink = ({
     { search: blueprintSearchInput },
     {
       selectFromResult: ({ data }) => ({
-        selectedBlueprintVersion: data?.data?.find(
+        selectedBlueprintVersion: data?.data.find(
           (blueprint: BlueprintItem) => blueprint.id === selectedBlueprintId
         )?.version,
       }),
@@ -128,7 +128,7 @@ const ProvisioningLink = ({
   ) {
     return <DisabledProvisioningLink />;
   } else {
-    const ProvisioningWizard = exposedScalprumModule?.default;
+    const ProvisioningWizard = exposedScalprumModule.default;
     const provider = getImageProvider(compose);
 
     const options = compose.request.image_requests[0].upload_request.options;
@@ -239,10 +239,6 @@ export const OciInstance = ({ compose, isExpired }: OciInstancePropTypes) => {
     composeId: compose.id,
   });
 
-  if (!isSuccess) {
-    return <Skeleton />;
-  }
-
   const options = data?.image_status.upload_status?.options;
 
   if (options && !isOciUploadStatus(options)) {
diff --git a/src/Components/ImagesTable/Status.tsx b/src/Components/ImagesTable/Status.tsx
index 4b96ea0d6..454398fcf 100644
--- a/src/Components/ImagesTable/Status.tsx
+++ b/src/Components/ImagesTable/Status.tsx
@@ -84,7 +84,7 @@ export const AwsDetailsStatus = ({ compose }: ComposeStatusPropTypes) => {
         <ErrorStatus
           icon={statuses[data.image_status.status].icon}
           text={statuses[data.image_status.status].text}
-          error={data?.image_status?.error || ''}
+          error={data.image_status.error || ''}
         />
       );
     default:
diff --git a/src/Components/ImagesTable/Target.tsx b/src/Components/ImagesTable/Target.tsx
index 2b28f508a..e0490af55 100644
--- a/src/Components/ImagesTable/Target.tsx
+++ b/src/Components/ImagesTable/Target.tsx
@@ -27,6 +27,6 @@ export const AwsTarget = ({ compose }: AwsTargetPropTypes) => {
     return <Skeleton />;
   }
 
-  const text = `${targetOptions.aws} (${data?.data?.length ?? 0 + 1})`;
+  const text = `${targetOptions.aws} (${data?.data.length ?? 0 + 1})`;
   return <>{text}</>;
 };
diff --git a/src/Components/LandingPage/LandingPage.tsx b/src/Components/LandingPage/LandingPage.tsx
index 88b7614a4..28f39d2fc 100644
--- a/src/Components/LandingPage/LandingPage.tsx
+++ b/src/Components/LandingPage/LandingPage.tsx
@@ -49,7 +49,7 @@ export const LandingPage = () => {
   }, [initialActiveTabKey]);
   const handleTabClick = (_event: React.MouseEvent, tabIndex: number) => {
     const tabPath = tabsPath[tabIndex];
-    if (tabPath !== undefined) {
+    if (tabPath !== '') {
       navigate(tabPath);
     }
     setActiveTabKey(tabIndex);
diff --git a/src/Utilities/useDebounce.tsx b/src/Utilities/useDebounce.tsx
index 4ef276d5d..d104ef968 100644
--- a/src/Utilities/useDebounce.tsx
+++ b/src/Utilities/useDebounce.tsx
@@ -15,7 +15,7 @@ function useDebounce<T>(
     if (!isEqual(value, debouncedValue)) {
       const timer = setTimeout(
         () => setDebouncedValue(value),
-        value === '' ? 0 : delay !== undefined ? delay : 500 //If value is empty string, instantly return
+        value === '' ? 0 : delay //If value is empty string, instantly return
       );
 
       return () => {
diff --git a/src/test/fixtures/packages.ts b/src/test/fixtures/packages.ts
index b2b35e310..1b01dc1f3 100644
--- a/src/test/fixtures/packages.ts
+++ b/src/test/fixtures/packages.ts
@@ -48,7 +48,7 @@ export const mockSourcesPackagesResults = (
       },
     ];
   }
-  if (search === 'mock' && isDistroPkgSearch) {
+  if (search === 'mock') {
     return [
       {
         package_name: 'mockPkg',