Fix assignment operators