diff --git a/server/modules/routing/avrorouter/avro_file.c b/server/modules/routing/avrorouter/avro_file.c
index ee9fd04f2..cbb011f85 100644
--- a/server/modules/routing/avrorouter/avro_file.c
+++ b/server/modules/routing/avrorouter/avro_file.c
@@ -1124,7 +1124,7 @@ void handle_query_event(AVRO_INSTANCE *router, REP_HEADER *hdr, int *pending_tra
         }
         else
         {
-            created = table_create_alloc(ident, sql, len, db);
+            created = table_create_alloc(ident, sql, len);
         }
 
         if (created && !save_and_replace_table_create(router, created))
diff --git a/server/modules/routing/avrorouter/avro_rbr.c b/server/modules/routing/avrorouter/avro_rbr.c
index 4b9f5d177..dc72be06a 100644
--- a/server/modules/routing/avrorouter/avro_rbr.c
+++ b/server/modules/routing/avrorouter/avro_rbr.c
@@ -288,7 +288,7 @@ bool handle_row_event(AVRO_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr)
             int rows = 0;
             MXS_INFO("Row Event for '%s' at %lu", table_ident, router->current_pos);
 
-            while (ptr - start < hdr->event_size - BINLOG_EVENT_HDR_LEN)
+            while (ptr < end)
             {
                 static uint64_t total_row_count = 1;
                 MXS_INFO("Row %lu", total_row_count++);
@@ -514,7 +514,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
 {
     int npresent = 0;
     avro_value_t field;
-    long ncolumns = MXS_MIN(map->columns, create->columns);
+    long ncolumns = map->columns;
     uint8_t *metadata = map->column_metadata;
     size_t metadata_offset = 0;
 
diff --git a/server/modules/routing/avrorouter/avro_schema.c b/server/modules/routing/avrorouter/avro_schema.c
index aaacc4a32..962a394f7 100644
--- a/server/modules/routing/avrorouter/avro_schema.c
+++ b/server/modules/routing/avrorouter/avro_schema.c
@@ -755,13 +755,13 @@ TABLE_CREATE* table_create_alloc(const char* ident, const char* sql, int len)
     {
         if ((rval = MXS_MALLOC(sizeof(TABLE_CREATE))))
         {
-            rval->version = resolve_table_version(db, table);
+            rval->version = resolve_table_version(database, table);
             rval->was_used = false;
             rval->column_names = names;
             rval->column_lengths = lengths;
             rval->column_types = types;
             rval->columns = n_columns;
-            rval->database = MXS_STRDUP(db);
+            rval->database = MXS_STRDUP(database);
             rval->table = MXS_STRDUP(table);
         }
 
diff --git a/server/modules/routing/avrorouter/avrorouter.h b/server/modules/routing/avrorouter/avrorouter.h
index 02f1b8d6c..41a4f93fa 100644
--- a/server/modules/routing/avrorouter/avrorouter.h
+++ b/server/modules/routing/avrorouter/avrorouter.h
@@ -302,7 +302,7 @@ extern void read_table_info(uint8_t *ptr, uint8_t post_header_len, uint64_t *tab
                             char* dest, size_t len);
 extern TABLE_MAP *table_map_alloc(uint8_t *ptr, uint8_t hdr_len, TABLE_CREATE* create);
 extern void table_map_free(TABLE_MAP *map);
-extern TABLE_CREATE* table_create_alloc(const char* ident, const char* sql, int len, const char* db);
+extern TABLE_CREATE* table_create_alloc(const char* ident, const char* sql, int len);
 extern TABLE_CREATE* table_create_copy(AVRO_INSTANCE *router, const char* sql, size_t len, const char* db);
 extern void table_create_free(TABLE_CREATE* value);
 extern bool table_create_save(TABLE_CREATE *create, const char *filename);