Fixed most broken relations, thanks to the erd