diff --git a/api/format/master.c b/api/format/master.c
index e6ba80fe3fad04f56f82af77d6e26a3723a291c6..b1eda5b6b02a2eca4201706e352b6693c5e61ad0 100644
--- a/api/format/master.c
+++ b/api/format/master.c
@@ -70,8 +70,10 @@ void eb_device_flush(eb_device_t devicep) {
   device = EB_DEVICE(devicep);
   transport = EB_TRANSPORT(device->transport);
   
-  // assert (device->passive != devicep);
-  // assert (eb_width_refined(device->widths) != 0);
+  /*
+  assert (device->passive != devicep);
+  assert (eb_width_refined(device->widths) != 0);
+  */
   
   /* Calculate alignment values */
   data = device->widths & EB_DATAX;
diff --git a/api/transport/block.c b/api/transport/block.c
index 5ddcbd0f03797d3947cd80f8a2e70961117c4e58..7190476cbd423fe5fcd049ba48b9e8b7e4ca0809 100644
--- a/api/transport/block.c
+++ b/api/transport/block.c
@@ -70,6 +70,7 @@ int eb_socket_block(eb_socket_t socketp, int timeout_us) {
     
   if (timeout_us < 0) timeout_us = 0;
   
+  /* This use of division is ok, because it will never be done on an LM32 */
   timeout.tv_sec  = timeout_us / 1000000;
   timeout.tv_usec = timeout_us % 1000000;