Fixes for image gallery