fix schema changes