diff --git a/client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendNewSubmissionStrategy.java b/client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendNewSubmissionStrategy.java
index b1af51fa937b7a6ba67dbf85462c4edd0704d6c4..c472e83ffd3608eab1657046dccfe6a19d42942f 100644
--- a/client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendNewSubmissionStrategy.java
+++ b/client/src/main/java/dev/fitko/fitconnect/client/sender/strategies/SendNewSubmissionStrategy.java
@@ -59,9 +59,7 @@ public class SendNewSubmissionStrategy {
         final SubmissionForPickup announcedSubmission = sender.createSubmission(newSubmission);
         final UUID announcedSubmissionId = announcedSubmission.getSubmissionId();
 
-        final var startTimeAttachmentUpload = StopWatch.start();
         uploadAttachments(encryptedAttachments, announcedSubmissionId);
-        LOGGER.info("Uploading attachments took {}", StopWatch.stopWithFormattedTime(startTimeAttachmentUpload));
 
         LOGGER.info("Creating metadata");
         final Metadata metadata = buildMetadata(sendableSubmission, encryptedAttachments);
@@ -155,7 +153,9 @@ public class SendNewSubmissionStrategy {
             LOGGER.info("No attachments to upload");
         } else {
             LOGGER.info("Uploading {} attachment(s)", attachmentPayloads.size());
+            final var startTimeAttachmentUpload = StopWatch.start();
             attachmentPayloads.forEach(a -> sender.uploadAttachment(submissionId, a.getAttachmentId(), a.getEncryptedData()));
+            LOGGER.info("Uploading attachments took {}", StopWatch.stopWithFormattedTime(startTimeAttachmentUpload));
         }
     }
 
diff --git a/core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java b/core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java
index a791dde8ce7c65514c9e3bab74bf904944e7406a..b4bba3de097343e16eee9da72368e93eaa2b9a7a 100644
--- a/core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java
+++ b/core/src/main/java/dev/fitko/fitconnect/core/schema/SchemaResourceProvider.java
@@ -55,7 +55,7 @@ public class SchemaResourceProvider implements SchemaProvider {
         populateDestinationSchemas(schemaResources.getDestinationSchemaPaths());
         populateSubmissionDataSchemas(schemaResources.getSubmissionDataSchemaPath());
 
-        LOGGER.info("Initialised sdk schemas");
+        LOGGER.info("Initialised SDK schemas");
     }
 
     private void populateMetadataSchemas(final List<String> metadataSchemaPaths) {