diff --git a/debug.h b/debug.h
index 022ad36..289c577 100644
--- a/debug.h
+++ b/debug.h
@@ -40,7 +40,6 @@
  * since the printing may not sanitise strings etc. This will add a reasonable
  * amount to your executable size. */
 /* #define DEBUG_TRACE */
-#define DEBUG_TRACE
 
 /* All functions writing to the cleartext payload buffer call
  * CHECKCLEARTOWRITE() before writing. This is only really useful if you're
@@ -73,7 +72,6 @@
 /* To debug with GDB it is easier to run with no forking of child processes.
    You will need to pass "-F" as well. */
 /* #define DEBUG_NOFORK */
-#define DEBUG_NOFORK
 
 
 /* For testing as non-root on shadowed systems, include the crypt of a password
diff --git a/options.h b/options.h
index 9a775cf..726e64c 100644
--- a/options.h
+++ b/options.h
@@ -146,12 +146,13 @@ much traffic. */
 /* Generate hostkeys as-needed when the first connection using that key type occurs.
    This avoids the need to otherwise run "dropbearkey" and avoids some problems
    with badly seeded /dev/urandom when systems first boot.
-   This also requires a runtime flag "-R". */
+   This also requires a runtime flag "-R". This adds ~4kB to binary size (or hardly 
+   anything if dropbearkey is linked in a "dropbearmulti" binary) */
 #define DROPBEAR_DELAY_HOSTKEY
 
 /* Enable Curve25519 for key exchange. This is another elliptic
  * curve method with good security properties. Increases binary size
- * by ~10kB on x86-64 */
+ * by ~8kB on x86-64 */
 #define DROPBEAR_CURVE25519
 
 /* Enable elliptic curve Diffie Hellman key exchange, see note about