Misc fixes for 2013/05/09, incl. making "Fix your Gallery" task go faster.