A few changes to Image and other classes