Fix references and dump