fix schema issues