Some more DB changes