Fixing some issues (Force creation of database)