Additional adjustments to address galleria-related issues.