Moar image fixes