Fix import image bugs