image bugfixes