Fix schema issues