Bugfixes, images are handled differently