diff --git a/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioCommonData.kt b/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioCommonData.kt
index 3ea33fd..993e00d 100644
--- a/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioCommonData.kt
+++ b/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioCommonData.kt
@@ -67,13 +67,9 @@ data class MapBoundingBox(
  */
 @Serializable
 data class Colour(
-  @EncodeDefault // remove encode default?
   val red: Float = 0f,
-  @EncodeDefault
   val green: Float = 0f,
-  @EncodeDefault
   val blue: Float = 0f,
-  @EncodeDefault
   val alpha: Float = 1f,
 )
 
@@ -81,13 +77,9 @@ data class Colour(
 /** Size-efficient version of [Colour] (`4*4` bytes vs `4*1` bytes) */
 @Serializable
 data class ColourHex(
-  @EncodeDefault // remove encode default?
   val red: UByte = UByte.MIN_VALUE,
-  @EncodeDefault
   val green: UByte = UByte.MIN_VALUE,
-  @EncodeDefault
   val blue: UByte = UByte.MIN_VALUE,
-  @EncodeDefault
   val alpha: UByte = UByte.MAX_VALUE,
 ) {
   companion object {
diff --git a/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioIds.kt b/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioIds.kt
index 525ada3..4dcdb76 100644
--- a/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioIds.kt
+++ b/modules/events-schema/src/commonMain/kotlin/dev/adamko/kafkatorio/events/schema/factorioIds.kt
@@ -11,26 +11,36 @@ import kotlinx.serialization.Serializable
  */
 @Serializable
 @JvmInline
-value class SurfaceIndex(val value: UInt)
+value class SurfaceIndex(private val id: UInt) {
+  override fun toString(): String = "$id"
+}
 
 
 @Serializable
 @JvmInline
-value class ForceIndex(val value: UInt)
+value class ForceIndex(private val id: UInt) {
+  override fun toString(): String = "$id"
+}
 
 
 /** The player's index in `LuaGameScript::players` */
 @Serializable
 @JvmInline
-value class PlayerIndex(val value: UInt)
+value class PlayerIndex(private val id: UInt) {
+  override fun toString(): String = "$id"
+}
 
 
 /** This is universally unique for every entity that has one, for the lifetime of a whole game. */
 @Serializable
 @JvmInline
-value class UnitNumber(val value: UInt)
+value class UnitNumber(private val id: UInt) {
+  override fun toString(): String = "$id"
+}
 
 
 @Serializable
 @JvmInline
-value class PrototypeName(val value: String)
+value class PrototypeName(private val id: String) {
+  override fun toString(): String = id
+}
diff --git a/modules/events-schema/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/FactorioEventTest.kt b/modules/events-schema/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/FactorioEventTest.kt
index 4c2abd3..248e22b 100644
--- a/modules/events-schema/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/FactorioEventTest.kt
+++ b/modules/events-schema/src/commonTest/kotlin/dev/adamko/kafkatorio/events/schema/FactorioEventTest.kt
@@ -33,8 +33,7 @@ class FactorioEventTest : FunSpec({
            "chatColour": {
              "red": 1,
              "green": 0.62,
-             "blue": 0.25,
-             "alpha": 1
+             "blue": 0.25
            },
            "lastOnline": 2287061
          },
diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt
index 921e401..8d9c6e2 100644
--- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt
+++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt
@@ -9,9 +9,6 @@ import org.http4k.server.Undertow
 import org.http4k.server.asServer
 
 
-//private val appProps = ApplicationProperties()
-
-
 fun main(): Unit = runBlocking {
 
   KafkatorioKafkaAdmin.createKafkatorioTopics()
diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/topology/flowMapTiles.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/topology/flowMapTiles.kt
index e604844..3b30df1 100644
--- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/topology/flowMapTiles.kt
+++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/topology/flowMapTiles.kt
@@ -70,7 +70,7 @@ private value class TilePngFilename(
 ) {
   constructor(cmd: Cmd.CreateImage) : this(buildString {
     append("src/main/resources/kafkatorio-web-map")
-    append("/s${cmd.surfaceIndex.value}")
+    append("/s${cmd.surfaceIndex}")
     append("/z${cmd.chunkSize.zoomLevel}")
     append("/x${cmd.chunkPosition.x}")
     append("/y${cmd.chunkPosition.y}")