Fixed last bugs in scheme_setup.sql