Some Fixes for DB_BASIC (not useable yet)