Fixed errors in 2.6 and 3.x.