Some gallery interface fixes