Further schema changes tidying