Fix schema again