Fix image issues