Fixed foreign keys