Little fixes in DB