Gallery fixes