Fixes for Images (not finished)