diff --git a/src/st-flash/flash.c b/src/st-flash/flash.c
index 3b25dc214..d7d17f66f 100644
--- a/src/st-flash/flash.c
+++ b/src/st-flash/flash.c
@@ -1,17 +1,22 @@
 /* Simple wrapper around the stlink_flash_write function */
 
-// TODO - this should be done as just a simple flag to the st-util command line...
-
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <fcntl.h>
+#include <signal.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <stm32.h>
 #include <stlink.h>
+
+#include <common_flash.h>
+#include <map_file.h>
+#include <option_bytes.h>
+
 #include "flash.h"
-#include "option_bytes.h"
 
 static stlink_t *connected_stlink = NULL;
 
@@ -215,20 +220,25 @@ int main(int ac, char** av) {
                 (unsigned)remaining_option_length,
                 sl->option_base);
 
-            if (NULL != o.filename) {
-                if (0 == o.size) {
-                    o.size = sl->option_size;
+            uint32_t option_byte = 0;
+            err = stlink_read_option_bytes32(sl, &option_byte);
+            if (err == -1) {
+                printf("could not read option bytes (%d)\n", err);
+                goto on_error;
+            } else if (NULL != o.filename) {
+                int fd = open(o.filename, O_RDWR | O_TRUNC | O_CREAT | O_BINARY, 00700);
+                if (fd == -1) {
+                    fprintf(stderr, "open(%s) == -1\n", o.filename);
+                    goto on_error;
                 }
-                err = stlink_fread(sl, o.filename, o.format == FLASH_FORMAT_IHEX, sl->option_base, o.size);
-            } else {
-                uint32_t option_byte = 0;
-                err = stlink_read_option_bytes32(sl, &option_byte);
+                err = (uint32_t)write(fd, &option_byte, 4);
                 if (err == -1) {
-                    printf("could not read option bytes (%d)\n", err);
+                    printf("could not write buffer to file (%d)\n", err);
                     goto on_error;
-                } else {
-                    printf("%08x\n", option_byte);
                 }
+                close(fd);
+            } else {
+                printf("%08x\n", option_byte);
             }
         } else if (o.area == FLASH_OPTION_BYTES_BOOT_ADD) {
             uint32_t option_byte = 0;
diff --git a/src/st-util/semihosting.c b/src/st-util/semihosting.c
index 32169c812..f603f6224 100644
--- a/src/st-util/semihosting.c
+++ b/src/st-util/semihosting.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
 
 #include <stlink.h>
+
 #include <logging.h>
 #include "semihosting.h"
 
@@ -256,8 +258,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
             return(-1);
         }
 
-        DLOG("Semihosting: write(%d, target_addr:0x%08x, %u)\n", fd, buffer_address,
-             buffer_len);
+        DLOG("Semihosting: write(%d, target_addr:0x%08x, %u)\n", fd, buffer_address, buffer_len);
 
         *ret = (uint32_t)write(fd, buffer, buffer_len);
         saved_errno = errno;
diff --git a/src/stlink-lib/common.c b/src/stlink-lib/common.c
index e7c2392c1..fac97278e 100644
--- a/src/stlink-lib/common.c
+++ b/src/stlink-lib/common.c
@@ -1,18 +1,21 @@
-#include <helper.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <fcntl.h>
+#include <helper.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <md5.h>
+
 #include <stlink.h>
 #include <stm32.h>
 
-#include "common_flash.h"
 #include "calculate.h"
+#include "common_flash.h"
 #include "map_file.h"
+#include "md5.h"
+
 #include "common.h"
 
 #ifndef O_BINARY
diff --git a/src/stlink-lib/option_bytes.c b/src/stlink-lib/option_bytes.c
index 32becc5cf..9cbdd097b 100644
--- a/src/stlink-lib/option_bytes.c
+++ b/src/stlink-lib/option_bytes.c
@@ -1007,11 +1007,8 @@ int stlink_read_option_bytes32(stlink_t *sl, uint32_t *option_byte) {
   case STM32_CHIPID_F76xxx:
     return stlink_read_option_bytes_f7(sl, option_byte);
   case STM32_CHIPID_G0_CAT1:
-    return stlink_read_option_bytes_gx(sl, option_byte);
   case STM32_CHIPID_G0_CAT2:
-    return stlink_read_option_bytes_gx(sl, option_byte);
   case STM32_CHIPID_G4_CAT2:
-    return stlink_read_option_bytes_gx(sl, option_byte);
   case STM32_CHIPID_G4_CAT3:
     return stlink_read_option_bytes_gx(sl, option_byte);
   default: