Fix assignment relationships