Added client db and fixed build errors