3 files changed, 11 insertions, 7 deletions
diff --git a/src/kernel/ao_cmd.c b/src/kernel/ao_cmd.c
index 4ebaa607..cd662314 100644
--- a/src/kernel/ao_cmd.c
+++ b/src/kernel/ao_cmd.c
@@ -280,6 +280,9 @@ version(void)
 #if HAS_LOG
 	       "log-format       %u\n"
 #endif
+#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
+	       "program-space    %u\n"
+#endif
 	       , ao_manufacturer
 	       , ao_product
 	       , ao_serial_number
@@ -289,6 +292,9 @@ version(void)
 #if HAS_LOG
 	       , ao_log_format
 #endif
+#if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
+	       , (uint32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE
+#endif
 		);
 	printf("software-version %s\n", ao_version);
 }
diff --git a/src/kernel/ao_int64.c b/src/kernel/ao_int64.c
index aa23dbe0..ca75751b 100644
--- a/src/kernel/ao_int64.c
+++ b/src/kernel/ao_int64.c
@@ -17,8 +17,6 @@
 
 #include <ao_int64.h>
 
-__pdata ao_int64_t *__data ao_64r, *__data ao_64a, *__data ao_64b;
-
 void ao_plus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
 	__LOCAL uint32_t	t;
 
@@ -151,8 +149,8 @@ void ao_mul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG uint16_t b)
 		ao_neg64(&ap, a);
 		a = &ap;
 		negative++;
-	} else
-		ao_umul64_64_16(r, a, b);
+	}
+	ao_umul64_64_16(r, a, b);
 	if (negative)
 		ao_neg64(r, r);
 }
diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index 09f31188..3ff9e811 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -206,9 +206,9 @@ struct ao_log_mega {
 			uint16_t	flight;			/* 4 */
 			int16_t		ground_accel;		/* 6 */
 			uint32_t	ground_pres;		/* 8 */
-			int16_t		ground_accel_along;	/* 16 */
-			int16_t		ground_accel_across;	/* 12 */
-			int16_t		ground_accel_through;	/* 14 */
+			int16_t		ground_accel_along;	/* 12 */
+			int16_t		ground_accel_across;	/* 14 */
+			int16_t		ground_accel_through;	/* 16 */
 			int16_t		ground_roll;		/* 18 */
 			int16_t		ground_pitch;		/* 20 */
 			int16_t		ground_yaw;		/* 22 */