Fix images (mostly)