more fixes for images