Fix schema weirdness