Fix schema errors