Fixes in Gallery