diff --git a/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh b/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh
index 3df8e7c6..1e03a40f 100755
--- a/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh
+++ b/core/tabs/system-setup/fedora/nvidia-proprietary-driver-setup.sh
@@ -12,7 +12,7 @@
 checkRepo() {
   REPO_ID="rpmfusion-nonfree-nvidia-driver"
 
-  if [ $(dnf repolist enabled 2>/dev/null | grep "$REPO_ID" | wc -l) -gt 0 ]; then
+  if [ "$(dnf repolist enabled 2>/dev/null | grep -c "$REPO_ID")" -gt 0 ]; then
     printf "%b\n" "${GREEN}Nvidia non-free repository is already enabled.${RC}"
   else
     printf "%b\n" "${YELLOW}Nvidia non-free repository is not enabled. Enabling now...${RC}"
@@ -24,7 +24,7 @@ checkRepo() {
     "$ESCALATION_TOOL" dnf makecache
 
     # Verify if the repository is enabled
-    if [ $(dnf repolist enabled 2>/dev/null | grep "$REPO_ID" | wc -l) -gt 0 ]; then
+    if [ "$(dnf repolist enabled 2>/dev/null | grep -c "$REPO_ID")" -gt 0 ]; then
       printf "%b\n" "${GREEN}Nvidia non-free repository is now enabled...${RC}"
     else
       printf "%b\n" "${RED}Failed to enable nvidia non-free repository...${RC}"
diff --git a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh
index d8b0e2ac..59ccbcc1 100644
--- a/core/tabs/system-setup/fedora/rpm-fusion-setup.sh
+++ b/core/tabs/system-setup/fedora/rpm-fusion-setup.sh
@@ -9,7 +9,7 @@ installRPMFusion() {
         dnf)
             if [ ! -e /etc/yum.repos.d/rpmfusion-free.repo ] || [ ! -e /etc/yum.repos.d/rpmfusion-nonfree.repo ]; then
                 printf "%b\n" "${YELLOW}Installing RPM Fusion...${RC}"
-                "$ESCALATION_TOOL" "$PACKAGER" install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+                "$ESCALATION_TOOL" "$PACKAGER" install "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora)".noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-"$(rpm -E %fedora)".noarch.rpm
                 "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264
                 printf "%b\n" "${GREEN}RPM Fusion installed${RC}"
             else
diff --git a/core/tabs/system-setup/fedora/virtualization.sh b/core/tabs/system-setup/fedora/virtualization.sh
index 626c2e43..3359efeb 100644
--- a/core/tabs/system-setup/fedora/virtualization.sh
+++ b/core/tabs/system-setup/fedora/virtualization.sh
@@ -6,7 +6,7 @@
 configureVirtualization() {
     case "$PACKAGER" in
         dnf)
-            printf "%b\n" ${YELLOW}"Installing virtualization tools...${RC}"
+            printf "%b\n" "${YELLOW}Installing virtualization tools...${RC}"
             "$ESCALATION_TOOL" "$PACKAGER" install -y @virtualization 
             printf "%b\n" "${GREEN}Installed virtualization tools...${RC}"
             ;;