Fixes in gallery