gallery v2.0 fixes