Fix the image and work references