Fixes for images