Fixed some db relations. Added some missing