diff --git a/src/tui.cpp b/src/tui.cpp
index b0d1f76..68d701c 100644
--- a/src/tui.cpp
+++ b/src/tui.cpp
@@ -139,14 +139,15 @@ void generate_fstab() noexcept {
         fstab_cmd = menu_entries[static_cast<std::size_t>(selected)];
         screen.ExitLoopClosure()();
     };
+
+    static constexpr auto fstab_body = "\nThe FSTAB file (File System TABle) sets what storage devices\nand partitions are to be mounted, and how they are to be used.\n\nUUID (Universally Unique IDentifier) is recommended.\n\nIf no labels were set for the partitions earlier,\ndevice names will be used for the label option.\n";
+    detail::menu_widget(menu_entries, ok_callback, &selected, &screen, fstab_body);
+
     /* clang-format off */
     if (fstab_cmd.empty()) { return; }
     /* clang-format on */
 
     utils::generate_fstab(fstab_cmd);
-
-    static constexpr auto fstab_body = "\nThe FSTAB file (File System TABle) sets what storage devices\nand partitions are to be mounted, and how they are to be used.\n\nUUID (Universally Unique IDentifier) is recommended.\n\nIf no labels were set for the partitions earlier,\ndevice names will be used for the label option.\n";
-    detail::menu_widget(menu_entries, ok_callback, &selected, &screen, fstab_body);
 }
 
 // Set system hostname
diff --git a/src/utils.cpp b/src/utils.cpp
index 8c27f92..467b0d7 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -2003,7 +2003,7 @@ void setup_luks_keyfile() noexcept {
     // Add keyfile to luks
     const auto& root_name          = utils::exec("mount | awk '/\\/mnt / {print $1}' | sed s~/dev/mapper/~~g | sed s~/dev/~~g");
     const auto& root_part          = utils::exec(fmt::format(FMT_COMPILE("lsblk -i | tac | sed -r 's/^[^[:alnum:]]+//' | sed -n -e \"/{}/,/part/p\" | {} | tr -cd '[:alnum:]'"), root_name, "awk '/part/ {print $1}'"));
-    const auto& number_of_lukskeys = to_int(utils::exec(fmt::format(FMT_COMPILE("cryptsetup luksDump /dev/\"{}\" | grep \"ENABLED\" | wc -l"), root_part)));
+    const auto& number_of_lukskeys = utils::to_int(utils::exec(fmt::format(FMT_COMPILE("cryptsetup luksDump /dev/\"{}\" | grep \"ENABLED\" | wc -l"), root_part)));
     if (number_of_lukskeys < 4) {
         // Create a keyfile
 #ifdef NDEVENV
@@ -2137,7 +2137,7 @@ void final_check() noexcept {
     //[[ ! -e /mnt/.video_installed ]] && echo "- $_GCCheck" >> ${CHECKLIST}
 
     // Check if locales have been generated
-    if (to_int(utils::exec(fmt::format(FMT_COMPILE("arch-chroot {} locale -a | wc -l"), mountpoint), true)) < 3) {
+    if (utils::to_int(utils::exec(fmt::format(FMT_COMPILE("arch-chroot {} locale -a | wc -l"), mountpoint), true)) < 3) {
         checklist += "- Locales have not been generated\n";
     }