Automation fixes, plus some new automation for gallery UI.