more fixes for the base db setup