fixed schema issues