diff --git a/src/game/WorldHandlers/CalendarHandler.cpp b/src/game/WorldHandlers/CalendarHandler.cpp
index cde311ec7..8887b4896 100644
--- a/src/game/WorldHandlers/CalendarHandler.cpp
+++ b/src/game/WorldHandlers/CalendarHandler.cpp
@@ -530,7 +530,7 @@ void WorldSession::HandleCalendarEventRsvp(WorldPacket& recv_data)
     uint32 status;
 
     recv_data >> eventId >> inviteId >> status;
-    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId ["UI64FMTD "], InviteId [" UI64FMTD "], status %u",
+    DEBUG_FILTER_LOG(LOG_FILTER_CALENDAR, "EventId [" UI64FMTD "], InviteId [" UI64FMTD "], status %u",
                      eventId, inviteId, status);
 
     if (CalendarEvent* event = sCalendarMgr.GetEventById(eventId))
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index a5b7377db..7101aee48 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -276,6 +276,8 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
                 case FT_NA_BYTE:    storeValue((char)0, store, record, x, offset);           ++x; continue;
                 case FT_NA_FLOAT:   storeValue((float)0.0f, store, record, x, offset);       ++x; continue;
                 case FT_NA_POINTER: storeValue((char const*)NULL, store, record, x, offset); ++x; continue;
+                default:
+                    break;
             }
 
             // It is required that the input has at least as many columns set as the output requires
@@ -301,6 +303,7 @@ void SQLStorageLoaderBase<DerivedLoader, StorageClass>::Load(StorageClass& store
                     break;
                 default:
                     assert(false && "unknown format character");
+                    break;
             }
             ++y;
         }