fixed schema problems.