Fix following FK relationships