Fixed some issues with the latest image.