Fixed FKs in database and diagram