Db layout tweaks