Minor fixes.
Updated scheme_setup.sql