diff --git a/src/entity.c b/src/entity.c
index f525269e5..ffff74b8c 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -939,6 +939,7 @@ void ecs_set_watch(
     ecs_stage_t *stage,
     ecs_entity_t entity)
 {    
+    (void)world;
     ecs_row_t row = row_from_stage(stage, entity);
 
     if (row.index > 0) {
@@ -1037,7 +1038,6 @@ ecs_entity_t _ecs_new(
 
 static
 bool has_unset_columns(
-    ecs_world_t *world,
     ecs_type_t type,
     ecs_table_column_t *columns,
     ecs_table_data_t *data)
@@ -1046,7 +1046,7 @@ bool has_unset_columns(
         return true;
     }
 
-    int i;
+    uint32_t i;
     for (i = 0; i < data->column_count; i ++) {
         /* If no column is provided for component, skip it */
         ecs_entity_t component = data->components[i];
@@ -1071,7 +1071,6 @@ bool has_unset_columns(
 
 static
 void copy_column_data(
-    ecs_world_t *world,
     ecs_type_t type,
     ecs_table_column_t *columns,
     uint32_t start_row,
@@ -1198,7 +1197,7 @@ uint32_t update_entity_index(
                      * must be copied from the old table to the new table */
                     if (!tested_for_unset) {
                         has_unset = has_unset_columns(
-                            world, type, columns, data);
+                            type, columns, data);
                     }
 
                     if (has_unset) {
@@ -1338,7 +1337,7 @@ ecs_entity_t set_w_data_intern(
 
         /* If columns were provided, copy data from columns into table */
         if (data->columns) {
-            copy_column_data(world, type, columns, start_row, data);
+            copy_column_data(type, columns, start_row, data);
         }
 
         ecs_entity_info_t info = {
diff --git a/src/stage.c b/src/stage.c
index 3d8d2aef3..8a50b735f 100644
--- a/src/stage.c
+++ b/src/stage.c
@@ -41,9 +41,8 @@ void clean_data_stage(
             *(ecs_table_column_t**)ecs_map_next_w_key(&it, &keyval);
         
         ecs_type_t type = (ecs_type_t)(uintptr_t)keyval;
-        uint32_t count = ecs_vector_count(type);
+        uint32_t i, count = ecs_vector_count(type);
         
-        int i;
         for(i = 0; i < count + 1; i ++) {
             ecs_vector_free(columns[i].data);
         }
diff --git a/src/table.c b/src/table.c
index b69f7e2eb..f2c438b14 100644
--- a/src/table.c
+++ b/src/table.c
@@ -131,6 +131,7 @@ void ecs_table_free(
     ecs_world_t *world,
     ecs_table_t *table)
 {
+    (void)world;
     ecs_table_free_columns(table);
     ecs_os_free(table->columns);
     ecs_vector_free(table->frame_systems);
diff --git a/src/types.h b/src/types.h
index c7698110d..234ea75e2 100644
--- a/src/types.h
+++ b/src/types.h
@@ -180,7 +180,7 @@ typedef struct EcsSystem {
     
     int32_t cascade_by;            /* CASCADE column index */
     EcsSystemKind kind;            /* Kind of system */
-    float time_spent;              /* Time spent on running system */
+    double time_spent;              /* Time spent on running system */
     bool enabled;                  /* Is system enabled or not */
     bool has_refs;                 /* Does the system have reference columns */
     bool needs_tables;             /* Does the system need table matching */