fixed schema problems