Some small changes for testing in image.