Fix some image issue