diff --git a/CONTRIBUTING.txt b/CONTRIBUTING.txt
index f72c5fc..ff2c10b 100644
--- a/CONTRIBUTING.txt
+++ b/CONTRIBUTING.txt
@@ -41,7 +41,7 @@ been taking into consideration here.
     - Do not use 'func()' when prototyping use 'func(void)';
     - Arrays as function parameters are not welcome, use pointers;
     - Pointers are good. Taking into consideration that you are a fluent and experienced C programmer;
-    - The project should be the most self contained possible;
+    - The project should be the most self-contained possible;
     - Git submodules are ok, but must be hosted into 'src/lib' directory;
     - This project is GPLv2. Always include the copyright disclaimer in new code files;
     - Respect the credit from other people;
diff --git a/chg/saturn/.bcrepo/CATALOG b/chg/saturn/.bcrepo/CATALOG
index 9ea950d..f9400a8 100644
--- a/chg/saturn/.bcrepo/CATALOG
+++ b/chg/saturn/.bcrepo/CATALOG
@@ -2,11 +2,11 @@
 c2hhLTI1Ng==
 -----END BCREPO KEY HASH ALGO-----
 -----BEGIN BCREPO HMAC SCHEME-----
-aG1hYy1zaGEzLTI1Ni1zZXJwZW50LWNiYw==
+aG1hYy1zaGEtMjU2LXByZXNlbnQtMTI4LW9mYg==
 -----END BCREPO HMAC SCHEME-----
 -----BEGIN BCREPO ENCODER-----
 dXVlbmNvZGU=
 -----END BCREPO ENCODER-----
 -----BEGIN BCREPO CATALOG DATA-----
-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
+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
 -----END BCREPO CATALOG DATA-----
diff --git a/chg/saturn/data.pdf b/chg/saturn/data.pdf
index 8b88400..e371f61 100644
Binary files a/chg/saturn/data.pdf and b/chg/saturn/data.pdf differ
diff --git a/src/fs/bcrepo/bcrepo.c b/src/fs/bcrepo/bcrepo.c
index 85c5c19..6e90018 100644
--- a/src/fs/bcrepo/bcrepo.c
+++ b/src/fs/bcrepo/bcrepo.c
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <utime.h>
-#include <assert.h>
 
 // INFO(Rafael): This version not always will match the cmd tool version. It does not mean that the
 //               tool will generate unsupported data for the fs module.
@@ -1574,8 +1573,6 @@ static int unl_handle_meta_proc(const char *rootpath, const size_t rootpath_size
 
     in = bcrepo_read_file_data(rootpath, rootpath_size, path, path_size, &in_size);
 
-    assert(in != NULL);
-
     if (in == NULL) {
         no_error = 0;
         goto unl_handle_meta_proc_epilogue;
@@ -1593,8 +1590,6 @@ static int unl_handle_meta_proc(const char *rootpath, const size_t rootpath_size
         while ((no_error = bfs_data_wiping(rootpath, rootpath_size, path, path_size, in_size)) == 0 && ntry-- > 0)
             ;
 
-        assert(no_error != 0);
-
         if (ntry == 0 && no_error == 0) {
             goto unl_handle_meta_proc_epilogue;
         }
@@ -1602,8 +1597,6 @@ static int unl_handle_meta_proc(const char *rootpath, const size_t rootpath_size
 
     out = dproc(protlayer, in, in_size, &out_size);
 
-    assert(out != NULL);
-
     if (out == NULL) {
         no_error = 0;
         goto unl_handle_meta_proc_epilogue;
@@ -1611,8 +1604,6 @@ static int unl_handle_meta_proc(const char *rootpath, const size_t rootpath_size
 
     no_error = bcrepo_write_file_data(rootpath, rootpath_size, path, path_size, out, out_size);
 
-    assert(no_error != 0);
-
 unl_handle_meta_proc_epilogue:
 
     if (in != NULL) {
@@ -2939,7 +2930,10 @@ static void dump_catalog_data(kryptos_u8_t *out, const size_t out_size, const bf
     };
     static size_t dumpers_nr = sizeof(dumpers) / sizeof(dumpers[0]), d;
     kryptos_u8_t *o;
-#define all_dump_done(d) ( (d)[0].done && (d)[1].done && (d)[2].done && (d)[3].done && (d)[4].done && (d)[5].done )
+    // WARN(Rafael): All dumpers must be included during this check. If you have added a new one in dumpers[] add its
+    //               writing verification here.
+#define all_dump_done(d) ( (d)[0].done && (d)[1].done && (d)[2].done &&\
+                           (d)[3].done && (d)[4].done && (d)[5].done && (d)[6].done )
 
     for (d = 0; d < dumpers_nr; d++) {
         dumpers[d].done = 0;