Fix places that relied on foreign key properties that were removed by update_store changes