Improve image handling.