merge fix and slowly fixing schemas