Fixing various missing images (and bad N&N entries)