Minor fixes to image checking