Attempts to fix Image issues