Fix build script
Fix database creation script