Fix image bugs