Various Fixes For DB_BASIC