diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h
index 6d7b2201..1b22d607 100644
--- a/common/JackLockedEngine.h
+++ b/common/JackLockedEngine.h
@@ -50,7 +50,7 @@ catch (...) {
         JackTools::KillServer();                     \
         return -1;                                  \
     } catch (...) {                                 \
-        jack_error("Unknown error...");             \   
+        jack_error("Unknown error...");             \
         throw;                                      \
     }                                               \
 
@@ -58,7 +58,7 @@ catch (...) {
     } catch(std::bad_alloc& e) {                    \
         jack_error("Memory allocation error...");   \
     } catch (...) {                                 \
-        jack_error("Unknown error...");             \   
+        jack_error("Unknown error...");             \
         throw;                                      \
     }                                               \
 
diff --git a/tests/test.cpp b/tests/test.cpp
index 1c558bc2..018b7499 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -185,6 +185,7 @@ int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const c
 {
      Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n");
      port_rename_clbk = 1;
+     return 0;
 }
 
 int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)