Fixes for 0 images