Fixed bug 2962, and some retagging