diff --git a/examples/C/large_grib1.c b/examples/C/large_grib1.c
index a01761ced..3131ead64 100644
--- a/examples/C/large_grib1.c
+++ b/examples/C/large_grib1.c
@@ -14,7 +14,7 @@
 #include "eccodes.h"
 
 /* See JIRA issue GRIB-361 */
-int main()
+int main(void)
 {
     const int ni = 2880;
     const int nj = 2880;
diff --git a/examples/F90/codes_dump.f90 b/examples/F90/codes_dump.f90
index b68c68e51..ab547ec04 100644
--- a/examples/F90/codes_dump.f90
+++ b/examples/F90/codes_dump.f90
@@ -12,7 +12,7 @@ program codes_dump_test
    implicit none
    integer            :: ifile, iret, msgid
    integer            :: product_kind
-   character(len=10)  :: product_string
+   character(len=512) :: product_string
    character(len=512) :: infile_name
 
    call getarg(1, product_string)
diff --git a/examples/F90/grib_count_messages_multi.f90 b/examples/F90/grib_count_messages_multi.f90
index 5e4fe92d9..67178fa6f 100644
--- a/examples/F90/grib_count_messages_multi.f90
+++ b/examples/F90/grib_count_messages_multi.f90
@@ -13,10 +13,10 @@ program grib_count_messages_multi
    use eccodes
    implicit none
 
-   integer                            ::  ifile
-   character(len=100)                 ::  grib_file
-   integer                            ::  n, stat
-   character(len=1)                   ::  multi_flag
+   integer                    ::  ifile
+   character(len=100)         ::  multi_flag
+   character(len=100)         ::  grib_file
+   integer                    ::  n, stat
 
    call getarg(1, multi_flag)
    call getarg(2, grib_file)
diff --git a/examples/F90/grib_read_bytes.f90 b/examples/F90/grib_read_bytes.f90
index 950eb2924..c118bdab4 100644
--- a/examples/F90/grib_read_bytes.f90
+++ b/examples/F90/grib_read_bytes.f90
@@ -7,7 +7,7 @@
 ! virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 !
 !
-program grib_read_bytes
+program read_bytes
   use eccodes
   implicit none
   integer :: ifile
diff --git a/fortran/grib_fortran.c b/fortran/grib_fortran.c
index ce9298348..3cb17739a 100644
--- a/fortran/grib_fortran.c
+++ b/fortran/grib_fortran.c
@@ -41,7 +41,7 @@ static pthread_mutex_t multi_handle_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t iterator_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t keys_iterator_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void init() {
+static void init(void) {
     pthread_mutexattr_t attr;
 
     pthread_mutexattr_init(&attr);
@@ -996,13 +996,13 @@ void grib_f_write_on_fail_(int* gid) {
     grib_f_write_on_fail(gid);
 }
 /*****************************************************************************/
-int grib_f_multi_support_on_()
+int grib_f_multi_support_on_(void)
 {
     grib_multi_support_on(0);
     return GRIB_SUCCESS;
 }
 
-int grib_f_multi_support_off_()
+int grib_f_multi_support_off_(void)
 {
     grib_multi_support_off(0);
     return GRIB_SUCCESS;
@@ -1181,13 +1181,13 @@ int grib_f_keys_iterator_delete_(int* iterid)
 }
 
 /*****************************************************************************/
-int grib_f_gribex_mode_on_()
+int grib_f_gribex_mode_on_(void)
 {
     grib_gribex_mode_on(0);
     return GRIB_SUCCESS;
 }
 
-int grib_f_gribex_mode_off_()
+int grib_f_gribex_mode_off_(void)
 {
     grib_gribex_mode_off(0);
     return GRIB_SUCCESS;
@@ -2877,13 +2877,13 @@ int grib_f_multi_append_(int* ingid, int* sec,int* mgid)
 }
 
 /*****************************************************************************/
-int codes_f_bufr_multi_element_constant_arrays_on_()
+int codes_f_bufr_multi_element_constant_arrays_on_(void)
 {
     codes_bufr_multi_element_constant_arrays_on(NULL);
     return GRIB_SUCCESS;
 }
 
-int codes_f_bufr_multi_element_constant_arrays_off_()
+int codes_f_bufr_multi_element_constant_arrays_off_(void)
 {
     codes_bufr_multi_element_constant_arrays_off(NULL);
     return GRIB_SUCCESS;