A few fixes to images