Fix for DB init