Fix references and image names