Even more image fixes