Fix issues in image handling