Modify some references