Fix Database setup