Still fixing foreign keys