Fixed more image issues