diff --git a/plugins/in_calyptia_fleet/in_calyptia_fleet.c b/plugins/in_calyptia_fleet/in_calyptia_fleet.c
index a1d9bdad642..3d4de1fe9ae 100644
--- a/plugins/in_calyptia_fleet/in_calyptia_fleet.c
+++ b/plugins/in_calyptia_fleet/in_calyptia_fleet.c
@@ -1655,7 +1655,7 @@ flb_sds_t fleet_config_get(struct flb_in_calyptia_fleet_config *ctx)
     flb_ctx_t *flb = flb_context_get();
     flb_sds_t fleet_id = NULL;
 
-    if( !ctx ) {
+    if (!ctx) {
         return NULL;
     }
 
diff --git a/plugins/in_calyptia_fleet/in_calyptia_fleet.h b/plugins/in_calyptia_fleet/in_calyptia_fleet.h
index 42a55a51516..315228edb7d 100644
--- a/plugins/in_calyptia_fleet/in_calyptia_fleet.h
+++ b/plugins/in_calyptia_fleet/in_calyptia_fleet.h
@@ -17,8 +17,8 @@
  *  limitations under the License.
  */
 
-#ifndef FLB_IN_CALYPTIA_FLEET
-#define FLB_IN_CALYPTIA_FLEET
+#ifndef FLB_IN_CALYPTIA_FLEET_H
+#define FLB_IN_CALYPTIA_FLEET_H
 
 #include <fluent-bit/flb_sds.h>
 #include <fluent-bit/flb_reload.h>
@@ -81,4 +81,4 @@ static int get_calyptia_files(struct flb_in_calyptia_fleet_config *ctx,
 
 static int fleet_cur_chdir(struct flb_in_calyptia_fleet_config *ctx);
 
-#endif /* FLB_IN_CALYPTIA_FLEET */
+#endif /* FLB_IN_CALYPTIA_FLEET_H */
diff --git a/tests/runtime/custom_calyptia_input_test.c b/tests/runtime/custom_calyptia_input_test.c
index 4923e2904ac..387d241cd16 100644
--- a/tests/runtime/custom_calyptia_input_test.c
+++ b/tests/runtime/custom_calyptia_input_test.c
@@ -307,6 +307,7 @@ static void test_calyptia_config_format() {
     TEST_MSG("fleet_config_legacy_format changed expected=%s got=%s", expectedValue, value);
     TEST_CHECK(value && strcasecmp(value, expectedValue) == 0);
 
+    flb_free(expectedValue);
     cleanup_test_context(t_ctx);
 }